Tags not handled #2 fixed