Store: price for last day

[markus]

I purchased Gold until Jan 1, 2018.
When I open the store again, it suggests buying Gold exactly until that date for 0,54€. If I set the "until date" to somewhere in 2017, it correctly says 0€ and also stays at 0€, if I then pick Jan 1, 2018 again.

Also, my subscriptions are now both ending Jan 1, 2018 (Gold excl. Empires and Empires) and are shown in two separate lines. I think the best way would be to have lines for different dates and listing all expansions that expire by the respective date.