fixing target/edit collections and subjects