AI-798 : fixed binding for Partner and Location references