issue #641 and other small fix
issue #640
small issue in search controller
Merge branch 'hotfixes' into develop