Fixed bug found in search controller

Fixed. Done
Merge pull request #81 from camilin87/master

Merge last changes to my branch
Merge pull request #82 from camilin87/kmoya-dev-branch

Kmoya dev branch merged to master branch