Added boolean checks for tagAPI