Queries

Change-Id: I51a819f1372b634512da233a566c87d307c42405
Signed-off-by: Matthias Steiner <matthias.steiner@inscope.net>