drop support for instance-var API of ExtraFields + Controller Bugfixes