Fix uniqueness check, add phrases