query for generic .raw more efficient now