Fixed some issues with the search

Still working on fixing a bug with the results controller and modal, but the search issues are almost resolved.