Fixed insta search
    Closes #22, closes #21