Add some missing logic for caption display