Fixes to linear querier