Different way to improve the subtitle version admin query (#788)

Hopefully this one works.