Refactors query to substitute spaces
Minor Refactors to search and query
Adds substitutions for hashtags and spaces
fixed merge conflict re: search controller