UDI: some code refactor, simple code when no index intersection is needed