Added filter and number-format directive