Combine two meta queries into one #4901