Include tags in expired events
Merge master