Refactor cities controller and serializers for better markers popup