Few more fixes for multicurrency input