Updates to query and sort builders