Index made more generic
Useless class deleted
Minor search update to fit new index