Rename favorites id to collection id
Added collection query generation
Fully implemented collections