Attempting to make cluster table filter safe for empty tables