Fixes to select dropdown which has been temporarily disabled