Notfound search update

Quick cleanup & reactor for notfound, discussed changes over with @sbsmith86 to make sure code was more clear.

To summarize, 
* Clarifying everything below the header with better names and simpler code
* Removing excess variables

cc: @aaronschachter 
(hopefully we never need to panic & hit that button...)