Two additional optional statements

for the height_extent_threshold query to make the test pass for FSL too.