search mechanism improvement