Fixed issues with null metric value and multiple metric values