diff --git a/VERSION b/VERSION
index b6c8b766..b816fa7e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.4.7-stable+timestamp.2013.06.04.09.30.34
+Version 2.4.7-stable+timestamp.2013.06.04.16.40.00
diff --git a/applications/admin/static/js/web2py.js b/applications/admin/static/js/web2py.js
index c4d5ee13..4fa32877 100644
--- a/applications/admin/static/js/web2py.js
+++ b/applications/admin/static/js/web2py.js
@@ -35,6 +35,7 @@ function web2py_ajax_init(target) {
   jQuery('.hidden', target).hide();
   jQuery('.error', target).hide().slideDown('slow');
   web2py_ajax_fields(target);
+  web2py_show_if(target);
 };
 
 function web2py_event_handlers() {
@@ -78,7 +79,6 @@ jQuery(function() {
    if(flash.html()) flash.append('<span id="closeflash">&times;</span>').slideDown();
    web2py_ajax_init(document);
    web2py_event_handlers();
-   web2py_show_if();
 });
 
 function web2py_trap_form(action,target) {
@@ -217,26 +217,26 @@ function web2py_validate_entropy(myfield, req_entropy) {
     if(!myfield.hasClass('entropy_check')) myfield.on('keyup', validator).on('keydown', validator).addClass('entropy_check');
 }
 
-function web2py_show_if() {
+function web2py_show_if(target) {
     var triggers = {};
-    var show_if = function() {
-        var t = jQuery(this);	
+    var show_if = function () {
+	var t = jQuery(this);
 	var id = t.attr('id');
-	t.attr('value',t.val());
-	for(var k=0; k<triggers[id].length; k++) {
-            var dep = jQuery('#'+triggers[id][k]);
-            var tr = jQuery('#'+triggers[id][k]+'__row');
+	t.attr('value', t.val());
+	for(var k = 0; k < triggers[id].length; k++) {
+	    var dep = jQuery('#' + triggers[id][k], target);
+	    var tr = jQuery('#' + triggers[id][k] + '__row', target);
 	    if(t.is(dep.attr('data-show-if'))) tr.slideDown();
-            else tr.hide();
+	    else tr.hide();
 	}
     };
-    jQuery('[data-show-trigger]').each(function(){	
-	var name = jQuery(this).attr('data-show-trigger');
-        if(!triggers[name]) triggers[name] = [];
-	triggers[name].push(jQuery(this).attr('id'));
-    });
+    jQuery('[data-show-trigger]', target).each(function () {
+	    var name = jQuery(this).attr('data-show-trigger');
+	    if(!triggers[name]) triggers[name] = [];
+	    triggers[name].push(jQuery(this).attr('id'));
+	});
     for(var name in triggers) {
-	jQuery('#'+name).change(show_if).keyup(show_if);
-        show_if.call(jQuery('#'+name));
+	jQuery('#' + name, target).change(show_if).keyup(show_if);
+	show_if.call(jQuery('#' + name, target));
     };
 }
\ No newline at end of file
diff --git a/applications/examples/static/js/web2py.js b/applications/examples/static/js/web2py.js
index c4d5ee13..4fa32877 100644
--- a/applications/examples/static/js/web2py.js
+++ b/applications/examples/static/js/web2py.js
@@ -35,6 +35,7 @@ function web2py_ajax_init(target) {
   jQuery('.hidden', target).hide();
   jQuery('.error', target).hide().slideDown('slow');
   web2py_ajax_fields(target);
+  web2py_show_if(target);
 };
 
 function web2py_event_handlers() {
@@ -78,7 +79,6 @@ jQuery(function() {
    if(flash.html()) flash.append('<span id="closeflash">&times;</span>').slideDown();
    web2py_ajax_init(document);
    web2py_event_handlers();
-   web2py_show_if();
 });
 
 function web2py_trap_form(action,target) {
@@ -217,26 +217,26 @@ function web2py_validate_entropy(myfield, req_entropy) {
     if(!myfield.hasClass('entropy_check')) myfield.on('keyup', validator).on('keydown', validator).addClass('entropy_check');
 }
 
-function web2py_show_if() {
+function web2py_show_if(target) {
     var triggers = {};
-    var show_if = function() {
-        var t = jQuery(this);	
+    var show_if = function () {
+	var t = jQuery(this);
 	var id = t.attr('id');
-	t.attr('value',t.val());
-	for(var k=0; k<triggers[id].length; k++) {
-            var dep = jQuery('#'+triggers[id][k]);
-            var tr = jQuery('#'+triggers[id][k]+'__row');
+	t.attr('value', t.val());
+	for(var k = 0; k < triggers[id].length; k++) {
+	    var dep = jQuery('#' + triggers[id][k], target);
+	    var tr = jQuery('#' + triggers[id][k] + '__row', target);
 	    if(t.is(dep.attr('data-show-if'))) tr.slideDown();
-            else tr.hide();
+	    else tr.hide();
 	}
     };
-    jQuery('[data-show-trigger]').each(function(){	
-	var name = jQuery(this).attr('data-show-trigger');
-        if(!triggers[name]) triggers[name] = [];
-	triggers[name].push(jQuery(this).attr('id'));
-    });
+    jQuery('[data-show-trigger]', target).each(function () {
+	    var name = jQuery(this).attr('data-show-trigger');
+	    if(!triggers[name]) triggers[name] = [];
+	    triggers[name].push(jQuery(this).attr('id'));
+	});
     for(var name in triggers) {
-	jQuery('#'+name).change(show_if).keyup(show_if);
-        show_if.call(jQuery('#'+name));
+	jQuery('#' + name, target).change(show_if).keyup(show_if);
+	show_if.call(jQuery('#' + name, target));
     };
 }
\ No newline at end of file
diff --git a/applications/welcome/static/js/web2py.js b/applications/welcome/static/js/web2py.js
index c4d5ee13..4fa32877 100644
--- a/applications/welcome/static/js/web2py.js
+++ b/applications/welcome/static/js/web2py.js
@@ -35,6 +35,7 @@ function web2py_ajax_init(target) {
   jQuery('.hidden', target).hide();
   jQuery('.error', target).hide().slideDown('slow');
   web2py_ajax_fields(target);
+  web2py_show_if(target);
 };
 
 function web2py_event_handlers() {
@@ -78,7 +79,6 @@ jQuery(function() {
    if(flash.html()) flash.append('<span id="closeflash">&times;</span>').slideDown();
    web2py_ajax_init(document);
    web2py_event_handlers();
-   web2py_show_if();
 });
 
 function web2py_trap_form(action,target) {
@@ -217,26 +217,26 @@ function web2py_validate_entropy(myfield, req_entropy) {
     if(!myfield.hasClass('entropy_check')) myfield.on('keyup', validator).on('keydown', validator).addClass('entropy_check');
 }
 
-function web2py_show_if() {
+function web2py_show_if(target) {
     var triggers = {};
-    var show_if = function() {
-        var t = jQuery(this);	
+    var show_if = function () {
+	var t = jQuery(this);
 	var id = t.attr('id');
-	t.attr('value',t.val());
-	for(var k=0; k<triggers[id].length; k++) {
-            var dep = jQuery('#'+triggers[id][k]);
-            var tr = jQuery('#'+triggers[id][k]+'__row');
+	t.attr('value', t.val());
+	for(var k = 0; k < triggers[id].length; k++) {
+	    var dep = jQuery('#' + triggers[id][k], target);
+	    var tr = jQuery('#' + triggers[id][k] + '__row', target);
 	    if(t.is(dep.attr('data-show-if'))) tr.slideDown();
-            else tr.hide();
+	    else tr.hide();
 	}
     };
-    jQuery('[data-show-trigger]').each(function(){	
-	var name = jQuery(this).attr('data-show-trigger');
-        if(!triggers[name]) triggers[name] = [];
-	triggers[name].push(jQuery(this).attr('id'));
-    });
+    jQuery('[data-show-trigger]', target).each(function () {
+	    var name = jQuery(this).attr('data-show-trigger');
+	    if(!triggers[name]) triggers[name] = [];
+	    triggers[name].push(jQuery(this).attr('id'));
+	});
     for(var name in triggers) {
-	jQuery('#'+name).change(show_if).keyup(show_if);
-        show_if.call(jQuery('#'+name));
+	jQuery('#' + name, target).change(show_if).keyup(show_if);
+	show_if.call(jQuery('#' + name, target));
     };
 }
\ No newline at end of file