Expand Comments filter to filter on all the fields the user can see