Corrected issue with metrics missing parameters and row counts