Refactor /cities and /countries endpoints
Extract search into separate class