Builtin database name filter is incorrectly applied only to collections instead of databases in snapshot

private Predicate<String> createDatabaseFilter() {
        var dbIncludeList = config.getDbIncludeList();
        var dbExcludeList = config.getDbExcludeList();

        return Optional.<Predicate<String>> empty()
                .or(() -> dbIncludeList.map(value -> includes(value, s -> s)))
                .or(() -> dbExcludeList.map(value -> excludes(value, s -> s)))
                .orElse((db) -> true);
    }

private Predicate<CollectionId> createCollectionFilter() {
        var collectionIncludeList = config.getCollectionIncludeList();
        var collectionExcludeList = config.getCollectionExcludeList();

        final Predicate<CollectionId> collectionFilter = Optional.<Predicate<CollectionId>> empty()
                .or(() -> collectionIncludeList.map(list -> includes(list, CollectionId::namespace)))
                .or(() -> collectionExcludeList.map(list -> excludes(list, CollectionId::namespace)))
                .orElse((id) -> true)
                .and(this::isNotBuiltIn);

        // Create signal collection filter if specified and not included
        Optional<Predicate<CollectionId>> signalCollectionFilter = config.getSignalDataCollection()
                .map(CollectionId::parse)
                .filter(id -> !collectionFilter.test(id))
                .map(id -> Predicates.includes(id.namespace(), CollectionId::namespace));

        // Combine signal filter and collection filter
        return signalCollectionFilter.map(collectionFilter::or).orElse(collectionFilter);
    }