[service, kpi] added singleton pattern for queries, to avoid reinstantiation of existing queries