[HOT FIX] fixing infinite loop on daily view (reverting refactoring code)
Merge branch 'fix_daily_view'