fixes for custom select