fix(sameAs): Fixes to same as

Fixes same-as to work for controller members
Adds watching the ethanol change