$397 Fixes queries for rendering epesodes.
styling
Merge remote-tracking branch 'upstream/development' into development