Remove searchable fields fix