updated to not add JSON to tags if included, added tests