Fixed natural key retrieval logic.