Have CORS
Fixed some logic for inserting issues