changes to the map mostly
full changes from dennis. some other fixes to advanced search