Continue with refactoring, remove deferred object from angular filters, related to #55