[to rebase] [WIP] fixing issues with incorrect hash key