diff --git a/l10n_client.js b/l10n_client.js
index 0bfdf71..f0f2107 100644
--- a/l10n_client.js
+++ b/l10n_client.js
@@ -16,12 +16,12 @@ jQuery.extend(Drupal, {
           if(userSelection.length > 0) {
             Drupal.l10nClient.filter(userSelection);
             Drupal.l10nClient.toggle(1);
-            $('#l10n-client .string-search').focus();      
+            $('#l10n-client #edit-search').focus();      
           } else {
             if($('#l10n-client').is('.hidden')) {
               Drupal.l10nClient.toggle(1);
               if(!$.browser.safari) {
-                $('#l10n-client .string-search').focus();
+                $('#l10n-client #edit-search').focus();
               }
             } else { 
               Drupal.l10nClient.toggle(0);
@@ -69,13 +69,13 @@ jQuery.extend(Drupal, {
       if(search == false || search == '') {
         $('#l10n-client #l10n-client-search-filter-clear').focus();
         $('#l10n-client-string-select li').show();
-        $('#l10n-client .string-search').val('');
-        $('#l10n-client .string-search').focus();
+        $('#l10n-client #edit-search').val('');
+        $('#l10n-client #edit-search').focus();
       } else {
         if(search.length > 0) {
           $('#l10n-client-string-select li').hide();
           $('#l10n-client-string-select li:contains('+search+')').show();
-          $('#l10n-client .string-search').val(search);
+          $('#l10n-client #edit-search').val(search);
         }
       }
     }
@@ -109,7 +109,7 @@ Drupal.behaviors.l10nClient = function (context) {
     var index = $('#l10n-client-string-select li').index(this);
 
     $('#l10n-client-string-editor .source-text').text(Drupal.l10nClient.getString(index, 'source'));
-    $('#l10n-client-form .translation-target').val(Drupal.l10nClient.getString(index, 'target'));
+    $('#l10n-client-form #edit-target').val(Drupal.l10nClient.getString(index, 'target'));
     $('#l10n-client-form .source-textgroup').val(Drupal.l10nClient.getString(index, 'textgroup'));
     Drupal.l10nClient.selected = index;
     $('#l10n-client-form .form-submit').removeAttr("disabled");
@@ -126,25 +126,25 @@ Drupal.behaviors.l10nClient = function (context) {
 
   // Copy source text to translation field on button click.
   $('#l10n-client-form .edit-copy').click(function() {
-    $('#l10n-client-form .translation-target').val($('#l10n-client-string-editor .source-text').text());
+    $('#l10n-client-form #edit-target').val($('#l10n-client-string-editor .source-text').text());
     return false;
   });
 
   // Clear translation field on button click.
   $('#l10n-client-form .edit-clear').click(function() {
-    $('#l10n-client-form .translation-target').val('');
+    $('#l10n-client-form #edit-target').val('');
     return false;
   });
 
   // Register keybindings using jQuery hotkeys
   if($.hotkeys) {
     $.hotkeys.add(Drupal.l10nClient.keys['toggle'], function(){Drupal.l10nClient.key('toggle')});
-    $.hotkeys.add(Drupal.l10nClient.keys['clear'], {target:'#l10n-client .string-search', type:'keyup'}, function(){Drupal.l10nClient.key('clear')});
+    $.hotkeys.add(Drupal.l10nClient.keys['clear'], {target:'#l10n-client #edit-search', type:'keyup'}, function(){Drupal.l10nClient.key('clear')});
   }
   
   // Custom listener for l10n_client livesearch
-  $('#l10n-client .string-search').keyup(function(key) {
-    Drupal.l10nClient.filter($('#l10n-client .string-search').val());
+  $('#l10n-client #edit-search').keyup(function(key) {
+    Drupal.l10nClient.filter($('#l10n-client #edit-search').val());
   });
 
   // Clear search
@@ -162,16 +162,16 @@ Drupal.behaviors.l10nClient = function (context) {
       // Send source and target strings.
       data: {
         source: $('#l10n-client-string-editor .source-text').text(),
-        target: $('#l10n-client-form .translation-target').val(),
+        target: $('#l10n-client-form #edit-target').val(),
         textgroup: $('#l10n-client-form .source-textgroup').val(),
         'form_token': $('#l10n-client-form #edit-l10n-client-form-form-token').val()
       },
       success: function (data) {
         // Store string in local js
-        Drupal.l10nClient.setString(Drupal.l10nClient.selected, $('#l10n-client-form .translation-target').val());
+        Drupal.l10nClient.setString(Drupal.l10nClient.selected, $('#l10n-client-form #edit-target').val());
 
         // Figure out the display of the new translation in the selection list.
-        var newTranslation = $('#l10n-client-form .translation-target').val();
+        var newTranslation = $('#l10n-client-form #edit-target').val();
         var newTranslationDisplay = newTranslation;
         var newTranslationStripped = newTranslation.replace(/<\/?[^<>]+>/gi, '')
                                                    .replace(/&quot;/g, '"')
@@ -196,7 +196,7 @@ Drupal.behaviors.l10nClient = function (context) {
         // Empty input fields.
         var messageValue = Drupal.parseJson(data);
         $('#l10n-client-string-editor .source-text').html(messageValue.message);
-        $('#l10n-client-form .translation-target').val('');
+        $('#l10n-client-form #edit-target').val('');
 
       },
       error: function (xmlhttp) {