Fix: Don't create batch when only changing batch.
Fix: check for numeric value