Fix question keys