Fixing behaviour on question selection when shuffle has not been
selected