Disabled search again in hopes of making index page viewable
Fixed merge conflicts