Added scoping for row expanders