move id as type int64 and return it after querying
Merge branch 'master' into tests