Fixed tag list breaking issue