reduce db overhead
EntityGatherChildren return type fixed