Fixed search
Fixed #19