Fix oa_util query using extra fields