Custom component HTML for RAP fix