Fix collation errors
schema changes; prefix relation to id fields
Woohoo!