fixed update and filter functions