Fix turning on querying with all fields

Change-Id: I2d66dd55e8e7564f4fa7d65ed1139e703d660b5e