Updated Map Search

A fix for a lot of the issues we have with the map search page.