restore changes lost by merge

and a couple of new changes to selectonequestion