Fixed resource identification substring bugs