Searching Video by Tags

Music files have ID3 tags and can be searched by Artist , Genre etc. I was wondering about Video files as now with a media server  hosing 500 + DVD and movies this becomes an issue. I understand MKV supports such tags. Does anyone know if that can be used? Any other alternatives?

I need something like this

Collection  ( Star Trek, James Bond)

   Season  ( S1)

     Episode / Album ( Casino Royale)

And off course Genre , Mood…


This is coming in firmware version 1.63.45.