remove the numeric field mapping and fix the restricted search