diff --git a/nodes/core/social/27-twitter.html b/nodes/core/social/27-twitter.html
index e6ab71bdf..aea189868 100644
--- a/nodes/core/social/27-twitter.html
+++ b/nodes/core/social/27-twitter.html
@@ -102,17 +102,17 @@
 </script>
 
 <script type="text/x-red" data-template-name="twitter in">
-	<div class="form-row">
+    <div class="form-row">
         <label for="node-input-twitter"><i class="icon-user"></i> Log in as</label>
         <input type="text" id="node-input-twitter">
     </div>
-	<div class="form-row">
-		<label for="node-input-user"><i class="icon-search"></i> Search</label>
-		<select type="text" id="node-input-user" style="display: inline-block; vertical-align: middle; width:60%;">
-			<option value="false">all public tweets</option>
-			<option value="true">the tweets of who you follow</option>
-		</select>
-	</div>
+    <div class="form-row">
+        <label for="node-input-user"><i class="icon-search"></i> Search</label>
+        <select type="text" id="node-input-user" style="display: inline-block; vertical-align: middle; width:60%;">
+            <option value="false">all public tweets</option>
+            <option value="true">the tweets of who you follow</option>
+        </select>
+    </div>
     <div class="form-row">
         <label for="node-input-tags"><i class="icon-tags"></i> for</label>
         <input type="text" id="node-input-tags" placeholder="comma-separated words, @ids, #tags">
@@ -127,10 +127,11 @@
 </script>
 
 <script type="text/x-red" data-help-name="twitter in">
-	<p>Twitter input node. Watches either the public or the user's stream for tweets containing the configured search term.</p>
-	<p>Sets the <b>msg.topic</b> to <i>tweets/</i> and then appends the senders screen name.</p>
-	<p>Sets <b>msg.location</b> to the tweeters location if known.</p>
-	<p>Sets <b>msg.tweet</b> to the full tweet object as documented by <a href="https://dev.twitter.com/docs/platform-objects/tweets">Twitter</a>.
+    <p>Twitter input node. Watches either the public or the user's stream for tweets containing the configured search term.</p>
+    <p>Use space for <i>and</i> and comma , for <i>or</i> when searching for multiple terms.</p>
+    <p>Sets the <b>msg.topic</b> to <i>tweets/</i> and then appends the senders screen name.</p>
+    <p>Sets <b>msg.location</b> to the tweeters location if known.</p>
+    <p>Sets <b>msg.tweet</b> to the full tweet object as documented by <a href="https://dev.twitter.com/docs/platform-objects/tweets">Twitter</a>.
 </script>
 
 <script type="text/javascript">
@@ -157,7 +158,6 @@
 </script>
 
 
-
 <script type="text/x-red" data-template-name="twitter out">
     <div class="form-row">
         <label for="node-input-twitter"><i class="icon-user"></i> Twitter</label>
@@ -170,7 +170,7 @@
 </script>
 
 <script type="text/x-red" data-help-name="twitter out">
-	<p>Twitter out node. Tweets the <b>msg.payload</b>.</p>
+    <p>Twitter out node. Tweets the <b>msg.payload</b>.</p>
 </script>
 
 <script type="text/javascript">
diff --git a/nodes/core/social/27-twitter.js b/nodes/core/social/27-twitter.js
index d9625807f..2548349ca 100644
--- a/nodes/core/social/27-twitter.js
+++ b/nodes/core/social/27-twitter.js
@@ -28,7 +28,8 @@ function TwitterInNode(n) {
     RED.nodes.createNode(this,n);
     this.active = true;
     this.user = n.user;
-    this.tags = n.tags.replace(/ /g,'');
+    //this.tags = n.tags.replace(/ /g,'');
+    this.tags = n.tags;
     this.twitter = n.twitter;
     this.topic = n.topic||"tweets";
     this.twitterConfig = RED.nodes.getNode(this.twitter);
@@ -36,10 +37,10 @@ function TwitterInNode(n) {
 
     if (credentials && credentials.screen_name == this.twitterConfig.screen_name) {
         var twit = new ntwitter({
-                consumer_key: "OKjYEd1ef2bfFolV25G5nQ",
-                consumer_secret: "meRsltCktVMUI8gmggpXett7WBLd1k0qidYazoML6g",
-                access_token_key: credentials.access_token,
-                access_token_secret: credentials.access_token_secret
+            consumer_key: "OKjYEd1ef2bfFolV25G5nQ",
+            consumer_secret: "meRsltCktVMUI8gmggpXett7WBLd1k0qidYazoML6g",
+            access_token_key: credentials.access_token,
+            access_token_secret: credentials.access_token_secret
         });
 
         var node = this;
@@ -47,33 +48,48 @@ function TwitterInNode(n) {
             try {
                 var thing = 'statuses/filter';
                 if (this.user == "true") { thing = 'user'; }
+                var st = { track: [node.tags] };
+                var bits = node.tags.split(",");
+                if ((bits.length > 0) && (bits.length % 4 == 0)) {
+                    if ((Number(bits[0]) < Number(bits[2])) && (Number(bits[1]) < Number(bits[3]))) {
+                        st = { locations: node.tags };
+                    }
+                    else {
+                        node.warn("twitter: possible bad geo area format. Should be lower-left lon,lat, upper-right lon,lat");
+                    }
+                }
+
                 function setupStream() {
                     if (node.active) {
-                        twit.stream(thing, { track: [node.tags] }, function(stream) {
-                                //twit.stream('user', { track: [node.tags] }, function(stream) {
-                                //twit.stream('site', { track: [node.tags] }, function(stream) {
-                                //twit.stream('statuses/filter', { track: [node.tags] }, function(stream) {
-                                node.stream = stream;
-                                stream.on('data', function(tweet) {
-                                        //console.log(tweet.user);
-                                        if (tweet.user !== undefined) {
-                                            var where = tweet.user.location||"";
-                                            var la = tweet.lang || tweet.user.lang;
-                                            //console.log(tweet.user.location,"=>",tweet.user.screen_name,"=>",pay);
-                                            var msg = { topic:node.topic+"/"+tweet.user.screen_name, payload:tweet.text, location:where, lang:la, tweet:tweet };
-                                            node.send(msg);
-                                        }
-                                });
-                                stream.on('error', function(tweet) {
-                                        node.warn(tweet);
-                                        setTimeout(setupStream,5000);
-                                });
-                                stream.on('destroy', function (response) {
-                                        if (this.active) {
-                                            node.warn("twitter ended unexpectedly");
-                                            setTimeout(setupStream,5000);
-                                        }
-                                });
+                        twit.stream(thing, st, function(stream) {
+                            //console.log(st);
+                            //twit.stream('user', { track: [node.tags] }, function(stream) {
+                            //twit.stream('site', { track: [node.tags] }, function(stream) {
+                            //twit.stream('statuses/filter', { track: [node.tags] }, function(stream) {
+                            node.stream = stream;
+                            stream.on('data', function(tweet) {
+                                //console.log(tweet.user);
+                                if (tweet.user !== undefined) {
+                                    var where = tweet.user.location||"";
+                                    var la = tweet.lang || tweet.user.lang;
+                                    //console.log(tweet.user.location,"=>",tweet.user.screen_name,"=>",pay);
+                                    var msg = { topic:node.topic+"/"+tweet.user.screen_name, payload:tweet.text, location:where, lang:la, tweet:tweet };
+                                    node.send(msg);
+                                }
+                            });
+                            stream.on('limit', function(tweet) {
+                                node.log("tweet rate limit hit");
+                            });
+                            stream.on('error', function(tweet,rc) {
+                                node.warn(tweet);
+                                setTimeout(setupStream,10000);
+                            });
+                            stream.on('destroy', function (response) {
+                                if (this.active) {
+                                    node.warn("twitter ended unexpectedly");
+                                    setTimeout(setupStream,10000);
+                                }
+                            });
                         });
                     }
                 }
@@ -85,125 +101,119 @@ function TwitterInNode(n) {
         } else {
             this.error("Invalid tag property");
         }
-
-
     } else {
         this.error("missing twitter credentials");
     }
-}
 
+    this.on('close', function() {
+        if (this.stream) {
+            this.active = false;
+            this.stream.destroy();
+        }
+    });
+}
 RED.nodes.registerType("twitter in",TwitterInNode);
 
-TwitterInNode.prototype.close = function() {
-    if (this.stream) {
-        this.active = false;
-		this.stream.destroy();
-	}
-}
 
 function TwitterOutNode(n) {
-	RED.nodes.createNode(this,n);
-	this.topic = n.topic;
-	this.twitter = n.twitter;
-	this.twitterConfig = RED.nodes.getNode(this.twitter);
+    RED.nodes.createNode(this,n);
+    this.topic = n.topic;
+    this.twitter = n.twitter;
+    this.twitterConfig = RED.nodes.getNode(this.twitter);
     var credentials = RED.nodes.getCredentials(this.twitter);
     var node = this;
 
     if (credentials && credentials.screen_name == this.twitterConfig.screen_name) {
         var twit = new ntwitter({
-                consumer_key: "OKjYEd1ef2bfFolV25G5nQ",
-                consumer_secret: "meRsltCktVMUI8gmggpXett7WBLd1k0qidYazoML6g",
-                access_token_key: credentials.access_token,
-                access_token_secret: credentials.access_token_secret
+            consumer_key: "OKjYEd1ef2bfFolV25G5nQ",
+            consumer_secret: "meRsltCktVMUI8gmggpXett7WBLd1k0qidYazoML6g",
+            access_token_key: credentials.access_token,
+            access_token_secret: credentials.access_token_secret
         }).verifyCredentials(function (err, data) {
-                if (err) {
-                    node.error("Error verifying credentials: " + err);
-                } else {
-                    node.on("input", function(msg) {
-                            if (msg != null) {
-                                if (msg.payload.length > 140) {
-                                    msg.payload = msg.payload.slice(0,139);
-                                    node.warn("Tweet greater than 140 : truncated");
-                                }
-                                twit.updateStatus(msg.payload, function (err, data) {
-                                        if (err) node.error(err);
-                                });
-                            }
-                    });
-                }
+            if (err) {
+                node.error("Error verifying credentials: " + err);
+            } else {
+                node.on("input", function(msg) {
+                    if (msg != null) {
+                        if (msg.payload.length > 140) {
+                            msg.payload = msg.payload.slice(0,139);
+                            node.warn("Tweet greater than 140 : truncated");
+                        }
+                        twit.updateStatus(msg.payload, function (err, data) {
+                            if (err) node.error(err);
+                        });
+                    }
+                });
+            }
         });
     }
 }
-
 RED.nodes.registerType("twitter out",TwitterOutNode);
 
-
-
 var oa = new OAuth(
-	"https://api.twitter.com/oauth/request_token",
-	"https://api.twitter.com/oauth/access_token",
-	"OKjYEd1ef2bfFolV25G5nQ",
-	"meRsltCktVMUI8gmggpXett7WBLd1k0qidYazoML6g",
-	"1.0",
-	null,
-	"HMAC-SHA1"
+    "https://api.twitter.com/oauth/request_token",
+    "https://api.twitter.com/oauth/access_token",
+    "OKjYEd1ef2bfFolV25G5nQ",
+    "meRsltCktVMUI8gmggpXett7WBLd1k0qidYazoML6g",
+    "1.0",
+    null,
+    "HMAC-SHA1"
 );
 
 var credentials = {};
 
 RED.app.get('/twitter/:id', function(req,res) {
-        var credentials = RED.nodes.getCredentials(req.params.id);
-        if (credentials) {
-            res.send(JSON.stringify({sn:credentials.screen_name}));
-        } else {
-            res.send(JSON.stringify({}));
-        }
+    var credentials = RED.nodes.getCredentials(req.params.id);
+    if (credentials) {
+        res.send(JSON.stringify({sn:credentials.screen_name}));
+    } else {
+        res.send(JSON.stringify({}));
+    }
 });
 
 RED.app.delete('/twitter/:id', function(req,res) {
-        RED.nodes.deleteCredentials(req.params.id);
-        res.send(200);
+    RED.nodes.deleteCredentials(req.params.id);
+    res.send(200);
 });
 
 RED.app.get('/twitter/:id/auth', function(req, res){
-        var credentials = {};
-        oa.getOAuthRequestToken({
-                oauth_callback: req.query.callback
-        },function(error, oauth_token, oauth_token_secret, results){
-            if (error) {
-                console.log(error);
-                res.send("yeah no. didn't work.")
-            }
-            else {
-                credentials.oauth_token = oauth_token;
-                credentials.oauth_token_secret = oauth_token_secret;
-                res.redirect('https://twitter.com/oauth/authorize?oauth_token='+oauth_token)
-                RED.nodes.addCredentials(req.params.id,credentials);
-            }
-        });
+    var credentials = {};
+    oa.getOAuthRequestToken({
+            oauth_callback: req.query.callback
+    },function(error, oauth_token, oauth_token_secret, results){
+        if (error) {
+            console.log(error);
+            res.send("yeah no. didn't work.")
+        }
+        else {
+            credentials.oauth_token = oauth_token;
+            credentials.oauth_token_secret = oauth_token_secret;
+            res.redirect('https://twitter.com/oauth/authorize?oauth_token='+oauth_token)
+            RED.nodes.addCredentials(req.params.id,credentials);
+        }
+    });
 });
 
 RED.app.get('/twitter/:id/auth/callback', function(req, res, next){
+    var credentials = RED.nodes.getCredentials(req.params.id);
+    credentials.oauth_verifier = req.query.oauth_verifier;
 
-        var credentials = RED.nodes.getCredentials(req.params.id);
-		credentials.oauth_verifier = req.query.oauth_verifier;
-
-		oa.getOAuthAccessToken(
-		    credentials.oauth_token,
-		    credentials.token_secret,
-		    credentials.oauth_verifier,
-            function(error, oauth_access_token, oauth_access_token_secret, results){
-                if (error){
-                    console.log(error);
-                    res.send("yeah something broke.");
-                } else {
-                    credentials = {};
-                    credentials.access_token = oauth_access_token;
-                    credentials.access_token_secret = oauth_access_token_secret;
-                    credentials.screen_name = "@"+results.screen_name;
-                    RED.nodes.addCredentials(req.params.id,credentials);
-                    res.send("<html><head></head><body>Authorised - you can close this window and return to Node-RED</body></html>");
-                }
+    oa.getOAuthAccessToken(
+        credentials.oauth_token,
+        credentials.token_secret,
+        credentials.oauth_verifier,
+        function(error, oauth_access_token, oauth_access_token_secret, results){
+            if (error){
+                console.log(error);
+                res.send("yeah something broke.");
+            } else {
+                credentials = {};
+                credentials.access_token = oauth_access_token;
+                credentials.access_token_secret = oauth_access_token_secret;
+                credentials.screen_name = "@"+results.screen_name;
+                RED.nodes.addCredentials(req.params.id,credentials);
+                res.send("<html><head></head><body>Authorised - you can close this window and return to Node-RED</body></html>");
             }
-		);
+        }
+    );
 });