Currently there is no 'City' field in the POI definition. When defining a new one (for instance gas station or train station), you have to specify the city in the name if you want to make it findable within a city search (for instance you want to serach all gas station in the city you are wazing). Thus congesting the map.
Maybe an option when searching for POIs to restrain research within a certain range would be helpful too.