index fields metadata.
tweak test queries.