Everything filter func finished

except for unit tests ...