fix named queries - new interpolation code