[GAIA BUG1018819] - Move TAG_OPTIONS to separate file
Merge pull request #320 from michalbe/Bug1018819-temp

[GAIA BUG1018819] - Move TAG_OPTIONS to separate file