--- a/locationtriggering/ltcontainer/src/lbtcontainerattrfilter.cpp	Thu Aug 19 10:20:18 2010 +0300
+++ b/locationtriggering/ltcontainer/src/lbtcontainerattrfilter.cpp	Tue Aug 31 15:37:04 2010 +0300
@@ -58,7 +58,7 @@
         TInt i=0;
         if(trigEntry!=NULL)
         	{
-            if((isFilterPresent>0 && isEntryRequested) || (iTriggerStateArray.Count()>0 && isFilterPresent==0))
+            if( iTriggerStateArray.Count()>0 )
             	{
                  isFilterPresent++;
                  for(i=0;i<iTriggerStateArray.Count();i++)
@@ -70,9 +70,11 @@
                         }
                     }
                 }
-            if( (isFilterPresent>0 && isEntryRequested && iTriggerValidityArray.Count()>0) || 
-                (iTriggerValidityArray.Count()>0 && isFilterPresent==0) )
+            if( (isFilterPresent>0 && isEntryRequested ) || 
+                (isFilterPresent==0) )
                 {
+                	if(iTriggerValidityArray.Count()>0)
+                		{
                 isFilterPresent++;
                 isEntryRequested=EFalse;
                 for(i=0;i<iTriggerValidityArray.Count();i++)
@@ -83,6 +85,7 @@
                       }                
                    }
                 }
+              }
                    
             if((isFilterPresent>0 && isEntryRequested && iTriggerTypeArray.Count()>0) || (iTriggerTypeArray.Count()>0 && isFilterPresent==0))
                 {