diff --git a/scanner/scanner.module b/scanner/scanner.module
index 10b7992..c3833e3 100644
--- a/scanner/scanner.module
+++ b/scanner/scanner.module
@@ -176,22 +176,25 @@
 
   //javascript checks to make sure user has entered some search text:
   drupal_add_js("
-    $(document).ready(function() {
-      $('input[@type=submit][@value=Search]').click(function() {
-        var searchfield = $('#edit-search');
+    jQuery(document).ready(function() {
+      var searchfield = jQuery('#edit-search');
+      jQuery('input[type=submit][value=". str_replace('\'', '\\\'', t('Search')) . "]').click(function() {
         var chars = searchfield.val().length;
         if (chars == 0) {
-          alert('Please provide some search text and try again.');
+          alert('". str_replace('\'', '\\\'', t('Please provide some search text and try again.')) . "');
           searchfield.addClass('error');
           searchfield[0].focus();
-          return FALSE;
+          return false;
         } else if (chars < 3) {
-          return confirm('Searching for a keyword that has fewer than three characters could take a long time. Are you sure you want to continue?');
+          return confirm('". str_replace('\'', '\\\'', t('Searching for a keyword that has fewer than three characters could take a long time. Are you sure you want to continue?')) . "');
         }
-        return TRUE;
+        return true;
+      });
+      searchfield.keyup(function() {
+        searchfield.removeClass('error');	
       });
     });
-  ", array('type' => 'inline', 'scope' => JS_DEFAULT));
+  ", array('type' => 'inline', 'group' => JS_DEFAULT));
   
   if (isset($_SESSION['scanner_search'])) {
     $search = $_SESSION['scanner_search'];
@@ -512,15 +515,15 @@
   //unfortunately we can't just use css disable to disable the button because then
   // the op values aren't sent to drupal correctly.
   drupal_add_js("
-    $(document).ready(function() {
-      $('input[@type=submit][@value=Yes, Continue]').click(function() {
-        $('.scanner-buttons').css('position','relative')
-          .append('<div class=\"scanner-button-msg\"><p>Replacing items... please wait...</p></div>')
-        $('.scanner-button-msg').click(function() { return false; });
+    jQuery(document).ready(function() {
+      jQuery('input[type=submit][value=". str_replace('\'', '\\\'', t('Yes, Continue')) . "]').click(function() {
+        jQuery('.scanner-buttons').css('position','relative')
+          .append('<div class=\"scanner-button-msg\"><p>". str_replace('\'', '\\\'', t('Replacing items... please wait...')) . "</p></div>')
+        jQuery('.scanner-button-msg').click(function() { return false; });
         return true;
       });
     });
-  ", array('type' => 'inline', 'scope' => JS_DEFAULT));
+  ", array('type' => 'inline', 'group' => JS_DEFAULT));
 
   $form = array();