Re-worked server 'discovery' code to better handle inclusions and exclusions.