Fix Rendering and select methods