Fixed Tags Issues