81759396 do not count policy ministers

This issue has already been resolved so I took the opportunity to refactor a bit.

* Replaced nested query with a single group by query
* Added a test
* Moved it into the model