added numbers and currencies handaling