Forecast: update trigger check, fixes #956
update comment for modified regex:wq
updated test, added queries that should not trigger
Merge pull request #958 from moollaza/zaahir/forecast-trigger

Forecast: update trigger check, fixes #956