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

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