Move version to :should part of query
Improve season-episode format