Continued development on quick queries.