Subset contracts
More contracts
Allow series in component_like
test fixes