cleaned/refactored maps, everything should work except the query locations from database. made changes in main layout.