Fixes search issue, correct displays user search query
renames variables in search controller
Merge branch 'search-error'