[#53350783] Heavy ground work for filter system, as well as some small bug fixes and little cleanups.