moved filter handler to seperate file