Search fixed. Close #8