Fix duplicate count domain and account query alias