Fix the Get Get/ID problem