Cleanup in tag definitions and page view event condition