fixed error with id lookup
Merge branch 'master' of https://github.com/reggiegg/GRTEAMWORK