forecast: more filters logic
Merge branch 'Adar'