Fix issue with parameter numbering. Fix issue with returning id of inserted record