Changed scope of DefaultQueryService to public