remove span and place th:if condition in inner section (#6192)

remove span and place th:if condition in inner section (#6192) #5034