fixed selection issues in hierarchy view