Cleaning and editsto support home url redirect