Added metadata to queries with field selection