Fix clicking on ObjectComponent when multiple selected
Refactorings