MAINT: centralizing more sql queries