Query changed to select all attribs