Merge branch 'try-to-fix-comment-filter' into 'master'

Simplify filter conditions - still not working in IOS

See merge request !373
4 jobs for 391-give-correct-icon-button-a-second-state-incorrect
in 8 minutes and 44 seconds and was queued for 1 second