It's great to see you becoming interested again. Way back when you posted your elevator, I couldn't wait for it to be released. Any part of your tunnel system could be useful. Hope to see more.
You're correct, SamIf you query the object in surveyor I believe there is an option that will make it fill loco tenders aswell, I'm not sure about that though...