modify query dsl logic, suport all query dsl