change key question order, fixes #17