Fix for issues relating to webAPI and episode searching.
Merge branch 'origin/dev'