Map Search Work

-finally got callback support working
-minor changes/improvements/tests