Fix prefixed ID Handling