#7 fixes for directives's controller/link