change operand
add support for @ to operand_rules
save