Fixes to the linear querier