fixed case files overwriting ids for child and abuser entries
Merge origin/master