Removed a compile warning
Removed a compile warning
Simplified filter logic