Fixing question flow to properly return the next type on count