Yet another query number adjustment