Fix crash and search on pre-HC