Edit filled with tags v2