Added generic map to search service