Bug 1018819 - Move TAG_OPTIONS to separate file