Capitalize filter and few changes on archiving template