You are correct on the Tombs.
I believe it is common for all levels of jurisdictions to use jails for pre-trial, trial, and pre-sentencing status prisoners/accused. Manafort went to the tombs last month, but I can’t remember why. i think he is federal.
I thought I’d made mistake last year, but I was wrong. Welcome to the club. LOL.