Fixed hierarchy selection for free params, other stuff