Rework variant queries