2014.04: improved keyfind