Fixed storing case insensitive component
More robust searching