are these buttons, ones you added? If yes, I went to one button and added a set of rules.
I started with a hidden field called FileName. On open this field is blank, On button click I do 3 actions:
1. Set this fields value, to my concat string
2. Submit using my submit data connection
3. Close the form: No Prompt
If FileName is not blank, then I already submitted the form, and I take these 2 actions:
1. Submit using the data connection
2. Close the form: No Prompt
Initially I tried using two buttons but was not happy with the results. Having similar issues to what you explained.
Let me know if you have any questions