improve autofix (autoexpand yy), check on valid data too