A few minor things

Order organizations
Fix VOD template tag