Query:
  raw modifier: "?"
  fix handling of primitive arrays