Name fix
Added check if the subscription already excists, plus type fix