query + badges

Signed-off-by: Laure Boutmy <laureboutmy@gmail.com>