fix overrides to remove blank span and until