Ensure that search is enabled before it gets initialised
Remove comments/reorganise configuration