changed [schema host] to [schema path] for more complex paths
changed bundle checking to be more deliberate