fix query for all data
fixed the service definition