Yes, that seems to have fixed the HX-Location issue. The modal closing is still not working in this single case, I will keep playing. Thanks @tall-dinner-62086