Made locations a little cleaner, and faster, and removed duplicates, and got more results