Fixed some minor mistakes.
Not going to pretend, I'm too sick to keep track of all these changes.  Committing for sanity.
Cleaned up connection between search and query, made everything work a little better under mobile.