Tiny refactor on POI Search