diff --git a/.github/workflows/generate_database.yml b/.github/workflows/generate_database.yml
index 4a8517d..f28c800 100644
--- a/.github/workflows/generate_database.yml
+++ b/.github/workflows/generate_database.yml
@@ -16,13 +16,7 @@ jobs:
         include:
           # use n_max=220 for tags and master, but only n_max=100 for PRs, etc.
           - n_max: ${{ (startsWith(github.ref, 'refs/tags/') || contains(github.ref, 'master')) && 220 || 100 }}
-          # FIXME: the following species do not yet support high \ell states
-          - species: Sr87
-            extra_args: "--skip-high-l"
-          - species: Yb171
-            extra_args: "--skip-high-l"
           - species: Yb173
-            extra_args: "--skip-high-l"  # FIXME: Yb173 fails for n > 115
             n_max: ${{ (startsWith(github.ref, 'refs/tags/') || contains(github.ref, 'master')) && 115 || 100 }}
     name: ${{ matrix.species }}
     runs-on: ubuntu-latest
diff --git a/MQDT.jl b/MQDT.jl
index af94b3f..3656d74 160000
--- a/MQDT.jl
+++ b/MQDT.jl
@@ -1 +1 @@
-Subproject commit af94b3fc53dca0715683be7d484e6e95c2b4362f
+Subproject commit 3656d74209824ee27119beef68d753aeb641491d
diff --git a/generate_database.jl b/generate_database.jl
index d5a6a38..7031fd0 100644
--- a/generate_database.jl
+++ b/generate_database.jl
@@ -94,7 +94,11 @@ function main()
         @info "Calculating high ℓ SQDT states..."
         l_max = n_max - 1
         l_start = FMODEL_MAX_L[species] + 1
-        high_l_models = single_channel_models(species, l_start:l_max)
+        if species in parameters.spin == 0
+            high_l_models = single_channel_jj_models(species, l_start:l_max)
+        else
+            high_l_models = single_channel_fj_models(species, l_start:l_max, parameters)
+        end
         @timelog high_l_states =
             [eigenstates(n_min, n_max, M, parameters) for M in high_l_models]
         states = vcat(states, high_l_states)