Fixed datasources bug

Resolver left 'hanging' if unknown name provided. Problem due to multiple datasource searching when name not found in initial target datasource. Resolved by splitting searches into multiple requests rather than one.