Best way to organize short-term savings?

Hi all,

I have keep an emergency budget in Xtrackers II EUR Overnight Rate Swap ETF

I want to use something similar for "short-term savings". However, I want a clean separation between funds I expect to spend within a year or two (e.g., for a vacation or some expensive purchase), and funds that are my emergency fund.

Ideally, I would like to use Revolut Pockets. They would allow me to categorize properly. But I don't want to, because they yield zero interest.

Another requirement I have is that my German taxes are handled for me. Scalable Capital does that, but they don't offer any categorization feature.

It feels like my need should be relatively common, but there appears to be zero support for it anywhere else?