BS-11624
Fix databinding
Remove refactoring capabilities