[BUGFIX] Correct storage selection (common prefixes)