Support multiple standard index conditions

Attempts to close #279 by refactoring IndexSerializer's query
method. This should be reviewed for correctness.
Merge branch 'titan03' into metrics