add fielddata queries