made changes to search possibilities

and added some extra classes