Attaches bug fix

Fix falal error when adding attach without ID + light cleanup