Merge branch 'issue/38' into 'master'

Issue #38: Fix unrelated filters, using join

See merge request !29
1 job for master in 44 seconds (queued for 3 seconds)