Change some hashmap keys from itemstacks to lists