Now specified category includes descendants
Remove unused method
Move extra_value methods to super
Move gp_calendar_content_event_id to inner calendar_relation