Add "or" to world location filter label

Also a bunch of other minor logic fixes in the filter to make
sure the organisation and world location filters show up when
they should.