Fix more population query stuff