Fixes in filters using original amount fields