improve id handling