Forgot a null check and exluded fluids

Fluid shouldn't be replaced by a little chunk, highlighter and wand
logic updated