Fixed repo performance issues. (was component conversion)