Updated search functionality in Irregular mode.