Push Dialog can select arbitrary kind of ref

issue 1572