more manual queries
 
Change-Id: Iea0134f30b3f41988d983ebf881fbb2a734f5ddb