Adding support for filters on index queries