Replace keysearch with keyfind in c2s + fix formatting