#4581: More user-friendly filter + using signals