Fix VSQ metadata hander, could be more consistent with ordinal metadata handler.