Fix an issue when both object properties and datatype properties were used in the "aggregate_attributes" parameter. If both were used, and if the "aggregate_attributes_object_type" was specified, than all the datatype properties were ignored, and their facets were not returned.