fix search mechanism