Adding characteristics.id to the select
Merge branch 'develop'