Add search options
Fix crash and search on pre-HC