Update to add the right icon and set/get hash ids from storage