Issue #959: Add condition to prevent items outside batch from displaying