Bug fixes to Choose Fragment