Fix some more issues with organization in plan dashboard