Issue 18833: Empty slots problem fixed, empty row mostly working