Improve filter

Need to check bot samaccountname and name as just name doesn't always work