union - saving activities to db, deployment fixes