Reworked search mechanism

Config screen is broken now