REPORTING-661: Add VisitQueryService
correct bug in defining advice point