Add V1 prefix and add simple instance filtering