add variant scope to element queries