Add extra fields only if field filter is not specified. Tempest complain...

...s on rxing extra contrail fields on query with specific field filter