that's definitely ok, it returns if its an
advanced query, and we don't care as we're going
to force it to be anyway

Change-Id: I5c5fec3f0978bc7f66db0b746dd69b60dc4c9026