Add reverse search, little fixes