For #15, change query to include sorting by name