Do not cast id columns to text, to allow indexed searches.
Merge branch 'master' into tests