Some changes for pattern matching check boxes