updated top level filtering. #309