Make sure container_type is set to Input and remove usage of file_id (redmine #1811)