Fix one-click moving with engine-define and wild-card pieces