Also update to use query() instead of get()