Rep 1039 sonar fixes

Quick sonar fixes round 1 
specifically i'm talking about around filterTimer != null