hierarchize too if only measures are selected for constistency
Merge branch 'master' into saiku3