Resolve TMSS-1964 "Front end only fix broken scheduling"

Reinder Kraaijrequested to merge
TMSS-1964-Front-End-Only-Fix-Broken-Scheduling into master

Implements some filtering feedback from the TMSS-1964 Review by the End User.

Merge request reports