diff --git a/src/js/familyTree.tw b/src/js/familyTree.tw
index 542759c09251609a28e52351ca95af51e517f524..5eeec4734765868541bcf09dff0da8c26fb45851 100644
--- a/src/js/familyTree.tw
+++ b/src/js/familyTree.tw
@@ -27,7 +27,10 @@ window.renderFamilyTree = function(slaves, filterID) {
 	var ftreeWidth,ftreeHeight;
 	var chartWidth, chartHeight;
 	var margin;
-	var svg = d3.select('#familyTree').append('svg');
+	d3.select('#ftree-canvas').remove();
+	var svg = d3.select('#familyTree')
+		.append('svg')
+		.attr('id','ftree-canvas');
 	var chartLayer = svg.append('g').classed('chartLayer', true);
 
 	var range = 100;
diff --git a/src/utility/extendedFamilyWidgets.tw b/src/utility/extendedFamilyWidgets.tw
index 742fa1302ebd3d9971c4e991b532af588c068699..44a6d35348fdf84d732fa146e8ba226c06e52e74 100644
--- a/src/utility/extendedFamilyWidgets.tw
+++ b/src/utility/extendedFamilyWidgets.tw
@@ -877,7 +877,10 @@
 <<replace '#fatherName'>><<parentName "father">><</replace>>
 <<replace '#sameMotherNames'>><<listOfSlavesWithSameParent 'mother'>><</replace>>
 <<replace '#sameFatherNames'>><<listOfSlavesWithSameParent 'father'>><</replace>>
-<<run updateFamilyTree($activeSlave, $slaves, $PC)>>
+/* <<run updateFamilyTree($activeSlave, $slaves, $PC)>> */
+<<set _tSlaveList = [$activeSlave]>>
+<<set _tSlaveList.push.apply(_tSlaveList, $slaves)>>
+<<run renderFamilyTree(_tSlaveList, $activeSlave.ID)>>
 <</widget>>
 
 /* First parameter is e.g. "father" or "mother"   and second parameter is the ID to match */
@@ -1074,9 +1077,13 @@
 &nbsp;&nbsp;&nbsp;&nbsp;<span id="familySummary"><<Family>></span>
 <br>
 </div>
-<div id="graph"></div>
+/*<div id="graph"></div>
 <<run updateFamilyTree($activeSlave, $slaves, $PC)>>
-<script>updateFamilyTree()</script>
+<script>updateFamilyTree()</script>*/
+<div id="familyTree"></div>
+<<set _tSlaveList = [$activeSlave]>>
+<<set _tSlaveList.push.apply(_tSlaveList, $slaves)>>
+<<run renderFamilyTree(_tSlaveList, $activeSlave.ID)>>
 </div>
 
 <</widget>>