Style updates to fix #3486 and #3487
Showing query string in form even when no results. Fixes #3496
Code commenting for clarity and readability
Merge pull request #3502 from sbsmith86/404-page-updates

404 style updates and bug fix