Small fixes to what questions to display
Caching