Ensure servers with no services are handled correctly
WIP - Reload when EDB data files change