FIX: Unify app handling