[12680] Improve [12678] with additional Vehicle checkes

This is required because transports are not always vehicles