Adding edge cases for table-based predicate/function