Work on OAI query gen