Refactored favourite and public server adapters.