Fix one last mention of q vs keyword var name, and CS reformat
Fix the search results query
Merge pull request #59 from shadyvb/master

Fix search query/result vars