Fixes: data attr, decorateModal