Improve querying.