Handle annotated tags properly