Fix: Correctly deal with 'auto-draft', improve code readability