Integrate nicolasbadia fix on selectview