Search - proper implementation

x