Fixes for per area forecast