diff --git a/front-api/controllers/category.rb b/front-api/controllers/category.rb
index 4a7630a..722a36a 100644
--- a/front-api/controllers/category.rb
+++ b/front-api/controllers/category.rb
@@ -1,11 +1,11 @@
 
 
 get '/category' do 
-  Category.order(:name).all.to_json(:include => [:sub_categories, :filter_criterias =>{:include => :filter_criteria_values} ])
+  Category.order(:name).all.to_json(:include => [:section, :sub_categories, :filter_criterias =>{:include => :filter_criteria_values} ])
 
 end
 
 get '/category/:id' do 
   id = params[:id].to_i
-  Category.find(id).to_json(:include => [:sub_categories, :filter_criterias =>{:include => :filter_criteria_values} ])
+  Category.find(id).to_json(:include => [:section, :sub_categories, :filter_criterias =>{:include => :filter_criteria_values}])
 end
diff --git a/front-ui/app/actions/navigationActions.js b/front-ui/app/actions/navigationActions.js
index 02c5de7..76ae99b 100644
--- a/front-ui/app/actions/navigationActions.js
+++ b/front-ui/app/actions/navigationActions.js
@@ -22,17 +22,17 @@ var NavigationActions = {
   },
 
   goToCategory: function(category,section, query) {
-  console.log("Going to item details");
-  var url ='/sekcija/' + section.get('name') +'/kategorija/'+ category.id + '/' + category.name;
+    var url ='/sekcija/' + section.get('name') +'/kategorija/'+ category.get('id') + '/' + category.get('name');
 
-  var q = '?';
-  if(query) {
-    for(var key in query) {
-      if (query.hasOwnProperty(key)) {
-        q += "&" + key + '=' + query[key];
+    q = '';
+    if(query) {
+      q = '?';
+      for(var key in query) {
+        if (query.hasOwnProperty(key)) {
+          q += "&" + key + '=' + query[key];
+        }
       }
     }
-  }
     AppDispatcher.handleAction({
       actionType: NavigationConstants.CHANGE_URL,
       url: (url + q)
diff --git a/front-ui/app/components/browsing/byCategory.js b/front-ui/app/components/browsing/byCategory.js
index da355a5..19e71db 100644
--- a/front-ui/app/components/browsing/byCategory.js
+++ b/front-ui/app/components/browsing/byCategory.js
@@ -23,13 +23,12 @@ var ByCategory = React.createClass({
   },
     onFCClick: function(fc, fcv) {
 
-      alert(fc.field_name);
       var q = {};
       q[fc.field_name] = fcv.filter_value;
       // TODO: fix this, clean this up
-      var s = new Section({name: 'meho'});
-var c = this.state.category;
-      NavigationActions.goToCategory({id: c.get('id'), name: c.get('name')}, s, q)
+      var section = new Section(this.state.category.get('section'));
+      var category = this.state.category;
+      NavigationActions.goToCategory(category, section, q)
     },
     render: function() {
       var self = this;
diff --git a/front-ui/app/components/browsing/bySection.js b/front-ui/app/components/browsing/bySection.js
index 5196ee9..401693c 100644
--- a/front-ui/app/components/browsing/bySection.js
+++ b/front-ui/app/components/browsing/bySection.js
@@ -8,7 +8,8 @@ var React = require('react'),
     SectionStore = require('../../stores/sectionStore'),
     SectionActions = require('../../actions/sectionActions.js'),
     NavigationActions = require('../../actions/navigationActions'),
-    Section = require('../../models/section');
+    Section = require('../../models/section'),
+    Category = require('../../models/category');
 
 var BySection = React.createClass({
   mixins: [Router.State],
@@ -57,7 +58,7 @@ var BySection = React.createClass({
         </div> )
     },
     onCategoryClick: function(category, section) {
-      NavigationActions.goToCategory(category, section);
+      NavigationActions.goToCategory(new Category(category), section);
        
     },
     componentWillReceiveProps: function(nextProps) {
diff --git a/front-ui/app/components/shared/sectionsListComponent.js b/front-ui/app/components/shared/sectionsListComponent.js
index 588ecf5..bc5ebbb 100644
--- a/front-ui/app/components/shared/sectionsListComponent.js
+++ b/front-ui/app/components/shared/sectionsListComponent.js
@@ -1,6 +1,7 @@
 var React = require('react'),
     SectionCollection = require('../../models/sectionCollection'),
     Section = require('../../models/section'),
+    Category = require('../../models/category'),
     Backbone = require('backbone'),
     NavigationStore = require('../../stores/navigationStore'),
     SectionStore = require('../../stores/sectionStore'),
@@ -37,7 +38,7 @@ var SectionsListComponent = React.createClass({
       return false;
     },
     onCategoryClick: function(category, section) {
-      NavigationActions.goToCategory(category, section);    
+      NavigationActions.goToCategory(new Category(category), section);    
       return false;
     },
     onSubcategoryClick: function(subcategory) {