Remove read of local rc to get the json name, small tweaks.