fix input collection/uri handling