Refactor of dump functions
Export funders query
Export grantees query
Export keyword query
Merge branch 'dump_query'