This fixes also the reverse lookup bug introduced by the previous patch
Attach a file by drag & drop or click to upload