Add meta-data also to queries.