Fixed issue with search in maps