Select form fix for production