Fix #3354: Guard queries trait from destroyed object
Remove ability to have a single unit guard itself