refactored aggregated feed and notification feed