based stored queries now check to see if required element is present before trying to filter by it
added missing $ in base query for services
removed blank elements from test docs