removed use of reserved words: type and id, fixed issues on links