[FOLD] fix key extractor