Fixes that help the govdata import, db queries