Fixed fetch filtering on vpc