Fix service visibility restrictions