Is your feature request related to a problem?

There are a few fields that should have the type flat_object.

What solution would you like?

Change the user_query field to be of the type flat_object.