HCSVLAB-750 Improve querying of metrics