tweak to keyset ids