Sorted draft files issue at expense of not showing current filename.