Fix CONSIST/CONTAIN pattern, remove COMPOSE Pattern