added the service_query and service controller
changed the names and values for services to make easier to query