[BUGFIX] Check default storage first to find default upload folder