support for currentdraft tag
updated todo