add some fixes for custom selects