fixed map
improved search