Fix multikeys
Rework