Improved key support, added "slow search timer"