Fix clicks on collection keys and values in the old UI.

[andreweland]

Also render both features from keys and values via the collection layer, rather than just the values.