FIX initial selection not loading