Moved handler to handlers filter