Unitless queries are handled inconsistently
When performing a query for a field that is associated with a unit, the default unit from the global unit context is not taken correctly into account in the query.
When performing a query for a field that is associated with a unit, the default unit from the global unit context is not taken correctly into account in the query.