[NUCCORE-1216] Enable via query extension