fix case of multiple filters broken in earlier refactor

Change-Id: I11db3e4c3d1b0ac35b06b25d82d207f3e4a95de7