Handle file fields in list fields too and a bit of clean up