Fixed bugs
Merge branch 'rework-getting-selected' into develop