Update to instantiate elementQuery