diff --git a/TimberWinR/Inputs/LogsListener.cs b/TimberWinR/Inputs/LogsListener.cs
index 3cf060b..cee930d 100644
--- a/TimberWinR/Inputs/LogsListener.cs
+++ b/TimberWinR/Inputs/LogsListener.cs
@@ -112,7 +112,6 @@ namespace TimberWinR.Inputs
                     {
                         try
                         {
-                            syncHandle.Wait(TimeSpan.FromSeconds(_pollingIntervalInSeconds), _cancelToken);
                             var qfiles = string.Format("SELECT Distinct [LogFilename] FROM {0}", fileToWatch);
                             var rsfiles = oLogQuery.Execute(qfiles, iFmt);
                             for (; !rsfiles.atEnd(); rsfiles.moveNext())
@@ -214,7 +213,7 @@ namespace TimberWinR.Inputs
                                 // Close the recordset
                                 rs.close();
                                 rs = null;
-                                GC.Collect();
+                                GC.Collect();                             
                             }
                         }
                         catch(FileNotFoundException fnfex)
@@ -233,6 +232,7 @@ namespace TimberWinR.Inputs
                         {
                             oLogQuery = null;
                         }
+                        syncHandle.Wait(TimeSpan.FromSeconds(_pollingIntervalInSeconds), _cancelToken);
                     }
                 }
                 Finished();
diff --git a/TimberWinR/Parser.cs b/TimberWinR/Parser.cs
index baa8e4c..051f0ad 100644
--- a/TimberWinR/Parser.cs
+++ b/TimberWinR/Parser.cs
@@ -870,12 +870,7 @@ namespace TimberWinR.Parser
                 var list = new List<LogstashFilter>();
                 
                 foreach (var filter in Filters)
-                {
-                    //if (filter is Json[])
-                    //{
-                    //    Json[] ja = filter as Json[];
-                    //    list.AddRange(ja);
-                    //}
+                {                  
                     foreach (var prop in filter.GetType().GetProperties())
                     {
                         object typedFilter = filter.GetType().GetProperty(prop.Name).GetValue(filter, null);