tags issues fixed