BugFix: Only add tags if dataWithCategory exists
Merge pull request #169 from FCStrike/dev

BugFix: Only add tags if dataWithCategory exists