Revert "Simplification of convert_date switch"

This reverts commit 4f062e30ed66a88a1ec120dbc97e94147804d3c6.
Revert "Gateways should show if there's a total"

This reverts commit 660f9b19f29947a1e5171cc8d7377b37b5357669.