Updates for querying fixes.