Added search functionalitybesides 12 minor bugfixes