Fix expansion handling and edit labeling for special rows

Fixes #2593
Hilight multiples according to contained records

This is the most awesome feature