Refactor libimagentryfilter