Changes to ArrayQueryHistory&KeyboardManager