Query: Fixes (workaround) for query plan issue where placeholder index does not start at zero#4885