Update to query selector