by Mederi: updated search languages
by Mederi and AbrahamVanhelpsing: Various fixes and cleanup