fixing tags
adding play
adding conditionals
Merge pull request #1162 from edx/e0d/xqwatcher-fixes

E0d/xqwatcher fixes