Fix problem with compound identity retrieval.
Add TODO for compound identity deletion