Added value to generated options to refer to ID

Sorry about all these individual commits/hotfixes. 
Git broke on my local repository and wouldn't let me commit so had to hand edit the files in github and re-clone the repo on my end.