adds/improves parsing for metadata-resource and metadata-table calls