Move UpdateSubkey query into query interface