added a few more FIXMEs to check_service_name()