Some changes in format_current_value