Fixing Handler/Filter issue