more fixes to invalid IDs