Allow not loading JS on AJAX & fixes to validation