Restore ctrl.$filter since it's best pinned to ctrl, fix issue with ctrl.isActive method returning false positives in initial empty state