BAP-6594: How to create components independent from active controller

 - review fixes