Fix batch select query to test no_thank_you field

Change-Id: I32d7ae1b4b935aca122715ac05af0fc61ff3a42e
Merge "Fix batch select query to test no_thank_you field"