Fixed KPIQueryValueService to retrieve dynamic queries