Fixed the Issue Issue #42. Also, improved performance of loading selected items for rendering.