Correct detection of selected entity [2]
Restoring selection after goind back/forward
Merge commit '7a1770cdd1d25dc72bf2619f4597a745bd3b477e' into develop