FAIMS-44, FAIMS-17, FAIMS-43 - fix the logic to not re-attach the file