[MECHDB] Scoping and validation tweaks