[ #54559 ] Improve Contact view filtering