Yeah it really is a hack. I tried playing with :visible but was concerned with perf issues. I think @ngokevin generic approach in #364 is better - we can completely forget about this PR if we merge his.