Remove double commit and fix search too