Fixed Tag label not saving and added test