include_query_string_in_uuid is now correctly propagated to the storage engine