change query to prepare more data to preview