Fix repeat on right tag and add visual clear