Fixing use of filter
Turned detachments into list of Detachment