JSPACE-82 Fix crosswalk returning empty results. Better handling of OAI args.