Additional fields in output (WARNING) and fixed mail to FA