Move element query inside round and match getters