Fixed to use order of form meta fields list if present