Fix button selectors

Previous selector in #3263 may cause errors in the changelist and changeforms
Hopefully this much strictier version is fitter