navlinks now added in middleware, search simplified