Fix service name filtering