Change from contains to startsWith