some ID related fixing

(: