Added volume filtering support