Modified query combiner.
Fixed conflicts