diff --git a/src/core/feedsmodel.cpp b/src/core/feedsmodel.cpp
index c291c6401..e2a72407d 100644
--- a/src/core/feedsmodel.cpp
+++ b/src/core/feedsmodel.cpp
@@ -23,7 +23,7 @@ FeedsModel::FeedsModel(QObject *parent) : QAbstractItemModel(parent) {
                    tr("Counts of unread/all meesages.");
 
   loadFromDatabase();
-/*
+  /*
   FeedsModelStandardCategory *cat1 = new FeedsModelStandardCategory();
   FeedsModelStandardCategory *cat2 = new FeedsModelStandardCategory();
   FeedsModelStandardFeed *feed1 = new FeedsModelStandardFeed();
@@ -164,8 +164,12 @@ int FeedsModel::columnCount(const QModelIndex &parent) const {
 }
 
 FeedsModelRootItem *FeedsModel::itemForIndex(const QModelIndex &index) {
-  FeedsModelRootItem *item = static_cast<FeedsModelRootItem*>(index.internalPointer());
-  return item;
+  if (index.isValid() && index.model() == this) {
+    return static_cast<FeedsModelRootItem*>(index.internalPointer());
+  }
+  else {
+    return NULL;
+  }
 }
 
 void FeedsModel::loadFromDatabase() {
@@ -244,11 +248,12 @@ QList<FeedsModelFeed*> FeedsModel::feedsForIndex(const QModelIndex &index) {
 
   switch (item->kind()) {
     case FeedsModelRootItem::Category:
+      // This item is a category, add all its child feeds.
       feeds.append(static_cast<FeedsModelCategory*>(item)->feeds());
       break;
 
     case FeedsModelRootItem::Feed:
-      // This item is feed (it SURELY subclasses FeedsModelFeed),add it.
+      // This item is feed (it SURELY subclasses FeedsModelFeed), add it.
       feeds.append(static_cast<FeedsModelFeed*>(item));
       break;
 
diff --git a/src/core/feedsmodel.h b/src/core/feedsmodel.h
index afb4958b9..8620ad379 100644
--- a/src/core/feedsmodel.h
+++ b/src/core/feedsmodel.h
@@ -45,15 +45,16 @@ class FeedsModel : public QAbstractItemModel {
     // Returns feeds contained within single index.
     QList<FeedsModelFeed*> feedsForIndex(const QModelIndex &index);
 
+    // Returns feed/category which lies at the specified index or
+    // null if index is invalid.
+    FeedsModelRootItem *itemForIndex(const QModelIndex &index);
+
   protected:
     // Loads feed/categories from the database.
     void loadFromDatabase();
 
     // TODO: Otestovat metody itemForIndex, feedsForIndex, feedsForIndexes.
 
-    // Returns feed/category which lies at the specified index.
-    FeedsModelRootItem *itemForIndex(const QModelIndex &index);
-
     // Takes lists of feeds/categories and assembles
     // them into the tree structure.
     void assembleCategories(CategoryAssignment categories);
diff --git a/src/core/feedsmodelcategory.cpp b/src/core/feedsmodelcategory.cpp
index 76adec502..45fe0e4b8 100755
--- a/src/core/feedsmodelcategory.cpp
+++ b/src/core/feedsmodelcategory.cpp
@@ -7,6 +7,7 @@
 
 FeedsModelCategory::FeedsModelCategory(FeedsModelRootItem *parent_item)
   : FeedsModelRootItem(parent_item) {
+  m_kind = FeedsModelRootItem::Category;
 }
 
 FeedsModelCategory::~FeedsModelCategory() {
diff --git a/src/core/feedsmodelfeed.cpp b/src/core/feedsmodelfeed.cpp
index a913c44d0..6c7e3dfcf 100755
--- a/src/core/feedsmodelfeed.cpp
+++ b/src/core/feedsmodelfeed.cpp
@@ -8,6 +8,7 @@
 
 FeedsModelFeed::FeedsModelFeed(FeedsModelRootItem *parent_item)
   : FeedsModelRootItem(parent_item), m_totalCount(0), m_unreadCount(0) {
+  m_kind = FeedsModelRootItem::Feed;
 }
 
 FeedsModelFeed::~FeedsModelFeed() {
diff --git a/src/core/feedsmodelstandardcategory.cpp b/src/core/feedsmodelstandardcategory.cpp
index 6d76ee59e..4ef2d50ba 100755
--- a/src/core/feedsmodelstandardcategory.cpp
+++ b/src/core/feedsmodelstandardcategory.cpp
@@ -8,7 +8,6 @@
 
 FeedsModelStandardCategory::FeedsModelStandardCategory(FeedsModelRootItem *parent_item)
   : FeedsModelCategory(parent_item) {
-  m_kind = FeedsModelRootItem::Category;
   m_type = Standard;
 }
 
diff --git a/src/core/feedsmodelstandardfeed.cpp b/src/core/feedsmodelstandardfeed.cpp
index cfe737709..6a3f112f4 100755
--- a/src/core/feedsmodelstandardfeed.cpp
+++ b/src/core/feedsmodelstandardfeed.cpp
@@ -8,7 +8,6 @@
 
 FeedsModelStandardFeed::FeedsModelStandardFeed(FeedsModelRootItem *parent_item)
   : FeedsModelFeed(parent_item) {
-  m_kind = FeedsModelRootItem::Category;
 }
 
 FeedsModelStandardFeed::~FeedsModelStandardFeed() {
diff --git a/src/gui/feedsview.cpp b/src/gui/feedsview.cpp
index ded1110bf..a1fa1f4e2 100644
--- a/src/gui/feedsview.cpp
+++ b/src/gui/feedsview.cpp
@@ -44,3 +44,14 @@ void FeedsView::setupAppearance() {
   setAllColumnsShowFocus(true);
   setSelectionMode(QAbstractItemView::ExtendedSelection);
 }
+
+void FeedsView::selectionChanged(const QItemSelection &selected,
+                                 const QItemSelection &deselected) {
+    QModelIndexList curr = selectionModel()->selectedRows();
+    QModelIndexList mapped = m_proxyModel->mapListToSource(curr);
+
+    QList<FeedsModelFeed*> feeds = m_sourceModel->feedsForIndexes(mapped);
+
+
+    int a = 5;
+}
diff --git a/src/gui/feedsview.h b/src/gui/feedsview.h
index 29b7bb234..f3a02fd1f 100644
--- a/src/gui/feedsview.h
+++ b/src/gui/feedsview.h
@@ -19,6 +19,8 @@ class FeedsView : public QTreeView {
     
   protected:
     void setupAppearance();
+    void selectionChanged(const QItemSelection &selected,
+                          const QItemSelection &deselected);
 
   private:
     FeedsModel *m_sourceModel;