Got key search working correctly.