Fixed trending overwrite and cleaning