re-arrange fetch of filefields & urls