Add search feature
Fix mindless copypasting