Exclude nil from architecture attribute sets

MSP-8986

`nil` should not be in sets because nil isn't a valid value for search
since '' is always parsed as '' and not cast to `nil`.