Better original metadata value parsing