Fix heat dynamic dropdown (key, value) order