Move data_attribute to after check for announcement