Changes to support filtering on variant catalogue