add search+ generalize navigation