#1583947 filtering on multiple fields fixed