fix to search and do search methods in controller, refactor form partial
Merge branch 'chore-fix-search' into dev