Allow non-service clients to be tagged
Merge pull request #72 from thewilkybarkid/parameter-converter-non-service-clients

Parameter converter non service clients