Fixes to work without data-field attributes