Fixed #19434 -- added support for extra_select fields in add_filter