Revert "Revert "entry questions""

This reverts commit 3cfd77b42eb014088dfa4bd01436ae99b7779ae1.