improved scoping & attribute/controller fallback