WP-3862 Getting the general hierarchy selection working