Kmoya dev branch merged to master branch

Bug fixed in search controller