bug fixes and trip rescinded filter tests