diff --git a/handlers/services.go b/handlers/services.go
index 2174edf2..e4640de4 100644
--- a/handlers/services.go
+++ b/handlers/services.go
@@ -12,7 +12,6 @@ import (
 	"github.com/statping/statping/utils"
 	"net/http"
 	"sort"
-	"strconv"
 	"time"
 )
 
@@ -41,23 +40,11 @@ func findService(r *http.Request) (*services.Service, error) {
 	return servicer, nil
 }
 
-func ConvertToUnixTime(str string) (time.Time, error) {
-	i, err := strconv.ParseInt(str, 10, 64)
-	var t time.Time
-	if err != nil {
-		return t, err
-	}
-	tm := time.Unix(i, 0)
-	return tm, nil
-}
-
 func findAllDowntimes(t string) []downtimes.Downtime {
-	var timeVar time.Time
-	if t == "" {
-		timeVar = time.Now()
-	} else {
+	timeVar := time.Now()
+	if t != "" {
 		var e error
-		timeVar, e = ConvertToUnixTime(t)
+		timeVar, e = utils.ConvertToUnixTime(t)
 		if e != nil {
 			return nil
 		}
@@ -564,9 +551,6 @@ func apiAllServicesStatusHandler(w http.ResponseWriter, r *http.Request) {
 		m[dtime[i].ServiceId] = dtime[i]
 	}
 	for _, v := range services.AllInOrder() {
-		if !v.Public.Bool && !IsUser(r) {
-			continue
-		}
 		var serviceDowntimeVar services.ServiceWithDowntime
 		serviceDowntimeVar.Service = v
 		if vv, ok := m[v.Id]; ok == true {
diff --git a/types/downtimes/database.go b/types/downtimes/database.go
index 95d2feca..7460805e 100644
--- a/types/downtimes/database.go
+++ b/types/downtimes/database.go
@@ -3,6 +3,7 @@ package downtimes
 import (
 	"fmt"
 	"github.com/statping/statping/database"
+	"github.com/statping/statping/utils"
 	"strconv"
 	"time"
 )
@@ -62,20 +63,10 @@ func FindByService(service int64, start time.Time, end time.Time) (*[]Downtime,
 func FindDowntime(timeVar time.Time) []Downtime {
 	var downtime []Downtime
 	q := db.Where("start <= ? and \"end\" >= ?", timeVar, timeVar)
-	q = q.Order("id ASC ").Find(&downtime)
+	q = q.Order("id ASC").Find(&downtime)
 	return downtime
-
 }
 
-func ConvertToUnixTime(str string) (time.Time, error) {
-	i, err := strconv.ParseInt(str, 10, 64)
-	var t time.Time
-	if err != nil {
-		return t, err
-	}
-	tm := time.Unix(i, 0)
-	return tm, nil
-}
 
 func FindAll(vars map[string]string) (*[]Downtime, error) {
 	var downtime []Downtime
@@ -86,11 +77,11 @@ func FindAll(vars map[string]string) (*[]Downtime, error) {
 	startInt, err := strconv.ParseInt(st, 10, 64)
 	endInt, err := strconv.ParseInt(en, 10, 64)
 	if err1 && err2 && (endInt > startInt) {
-		start, err = ConvertToUnixTime(vars["start"])
+		start, err = utils.ConvertToUnixTime(vars["start"])
 		if err != nil {
 			return &downtime, err
 		}
-		end, err = ConvertToUnixTime(vars["end"])
+		end, err = utils.ConvertToUnixTime(vars["end"])
 		if err != nil {
 			return &downtime, err
 		}
diff --git a/utils/utils.go b/utils/utils.go
index 2b12480b..b802e341 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -29,6 +29,16 @@ func NotNumber(val string) bool {
 	return err != nil
 }
 
+func ConvertToUnixTime(str string) (time.Time, error) {
+	i, err := strconv.ParseInt(str, 10, 64)
+	var t time.Time
+	if err != nil {
+		return t, err
+	}
+	tm := time.Unix(i, 0)
+	return tm, nil
+}
+
 // ToInt converts a int to a string
 func ToInt(s interface{}) int64 {
 	switch v := s.(type) {