starting to fix map search