Remove file inputs from form prepopulation
Try to find post id by post query first.
Merge remote-tracking branch 'Leads/master'