Small modifications to enable keyword retrieval