Query engine: handling of file controls
CLINPORTAL:7343 Minor UI fix to handle nested sub-forms