now looking good, search-map working