prepare indexed predicate copies

Signed-off-by: Andrey Rybalchenko <rybal@microsoft.com>
prepare indexed predicate clean up

Signed-off-by: Andrey Rybalchenko <rybal@microsoft.com>