Fix filename matching

Base on the server response, we check the filename to update the form