Select multiple on content handler
Add id to query only when not multiple results
Merge branch 'develop'