small sqls changes
merge dev to dev