Fix on sql statements
Merge branch 'collection-path'