Merge branch '357-checkbox-show-trajectory-only-for-visible-people-working-incorrectly' into 'master'

Refactor boolean expression

Closes #357

See merge request !249