Switch to resID-based lookups for HB criteria