Improved regex for amount matching