Tweak non-email and non-purchase key search. #1310