Fixed FX rate applied twice

Added waterfall to viewer