MDL-37471 - adding exception cases for when subtype is not the directory path