fixing search
fixing search
fixed search to encorporate psotres
fixed conflicts