Added search Feature and removed wrong classes from tables