fix/update demo
handle composite keys with new magic