Keep biblio from double joining the biblio contrib and contrib data tables, also remove filters we do not use. #1372