Adding searching fixes