diff --git a/routes/compat/shields/v1/badge.go b/routes/compat/shields/v1/badge.go
index 4c865de..651012f 100644
--- a/routes/compat/shields/v1/badge.go
+++ b/routes/compat/shields/v1/badge.go
@@ -70,6 +70,8 @@ func (h *BadgeHandler) ApiGet(w http.ResponseWriter, r *http.Request) {
 		filters = models.NewFiltersWith(models.SummaryLanguage, filterKey)
 	case "machine":
 		filters = models.NewFiltersWith(models.SummaryMachine, filterKey)
+	default:
+		filters = &models.Filters{}
 	}
 
 	summary, err, status := h.loadUserSummary(user, interval)
diff --git a/routes/compat/wakatime/v1/all_time.go b/routes/compat/wakatime/v1/all_time.go
index 28d4475..68ad6e8 100644
--- a/routes/compat/wakatime/v1/all_time.go
+++ b/routes/compat/wakatime/v1/all_time.go
@@ -43,7 +43,7 @@ func (h *AllTimeHandler) ApiGet(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	vm := v1.NewAllTimeFrom(summary, &models.Filters{Project: values.Get("project")})
+	vm := v1.NewAllTimeFrom(summary, models.NewFiltersWith(models.SummaryProject, values.Get("project")))
 	utils.RespondJSON(w, http.StatusOK, vm)
 }
 
diff --git a/services/alias.go b/services/alias.go
index 1090c1d..4bad2fb 100644
--- a/services/alias.go
+++ b/services/alias.go
@@ -1,7 +1,6 @@
 package services
 
 import (
-	"errors"
 	"github.com/muety/wakapi/config"
 	"sync"
 
@@ -36,15 +35,19 @@ func (srv *AliasService) LoadUserAliases(userId string) error {
 }
 
 func (srv *AliasService) GetAliasOrDefault(userId string, summaryType uint8, value string) (string, error) {
-	if ua, ok := userAliases.Load(userId); ok {
-		for _, a := range ua.([]*models.Alias) {
-			if a.Type == summaryType && a.Value == value {
-				return a.Key, nil
-			}
+	if !srv.IsInitialized(userId) {
+		if err := srv.LoadUserAliases(userId); err != nil {
+			return "", err
 		}
-		return value, nil
 	}
-	return "", errors.New("user aliases not initialized")
+
+	aliases, _ := userAliases.Load(userId)
+	for _, a := range aliases.([]*models.Alias) {
+		if a.Type == summaryType && a.Value == value {
+			return a.Key, nil
+		}
+	}
+	return value, nil
 }
 
 func (srv *AliasService) IsInitialized(userId string) bool {
diff --git a/version.txt b/version.txt
index 61ce01b..01b7568 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.13.2
+1.13.3