Query fix
Link id
Merge branch 'hotfix/hotfix'