More work with Currency and Category fieldset