Redefine query columns in provider
am: d3eeb40f05

Change-Id: I4de3b333cb8966b2542d7735acb22c1c7911378d