Refactor Comparator to Operator
Fix Filter.java

-Rename missed comparator variable name
-Fix for none for ReleaseNumber
Merge