I agree. The filename and title logic is a bit fragile. Thanks for the pull request! I'll review it later today.