Introduce a new query abstraction. Convert FindById and ScanById to use the new query abstraction.