Fix up award filtering for different forms of funder id/doi