updated prod-safe files for implementation consistency
choose database at every query