Fixed search, various merge conflicts