query: handle "null" string properly in query string (coerce to None)