fix questions stage and toast