Add Server filtering, Add city functionality