Allow storing all tags

(cherry picked from commit 26ad6e355b0742bba11d7164ae17056f4026d9e4)