Fix cluster output and classifier with date