Fixes #2550: adapt query for reporting to allow several policy server