correction of invalid metric expressions and addition of disk metrics