Fixed auto tag handler