Allow for missing logic
Legacy adapter fix
Add short id for equipment items to front end