LPS-36540 Fix invalid column name reference
LPS-36703 When using the default configuration we should not in include the positional parameter