*fixup Contains -> StartsWith for performance