Finally think I might've solved the tagging issue