Check in partial hash db rework
Save hash db code with both query impls