Update find to work more appropriately using #With.