Fixes empty trips state and animation overflow