Map Search Work

-db work
-more full search support
-better clustering support