less frameworky queries

Change-Id: I953cb962aa7d86aa9f180bd47a942f3e1db28923