- changed _id to id
- renamed queries