diff --git a/server/api/controller/geocoding.js b/server/api/controller/geocoding.js
index b30d166b..c2980a98 100644
--- a/server/api/controller/geocoding.js
+++ b/server/api/controller/geocoding.js
@@ -56,11 +56,11 @@ const geocodingController = {
   },
 
   async nominatimRateLimit(req, res, next) {
-    geocodingController.providerRateLimit(req, res, next, nominatim.cache)
+    process.env.NODE_ENV === 'test' ? next() : geocodingController.providerRateLimit(req, res, next, nominatim.cache)
   },
 
   async photonRateLimit(req, res, next) {
-    geocodingController.providerRateLimit(req, res, next, photon.cache)
+    process.env.NODE_ENV === 'test' ? next() : geocodingController.providerRateLimit(req, res, next, photon.cache)
   },
 
   async checkInCache (req, res, details, providerCache) {
diff --git a/server/api/controller/place.js b/server/api/controller/place.js
index bf9eb730..d76716ee 100644
--- a/server/api/controller/place.js
+++ b/server/api/controller/place.js
@@ -18,7 +18,7 @@ module.exports = {
 
     const format = req.params.format || 'json'
     log.debug(`Events for place: ${placeName}`)
-    const events = await eventController._select({ places: String(place.id), show_recurrent: true, older: true })
+    const events = await eventController._select({ places: String(place.id), show_recurrent: true, reverse: true, start_datetime: 0 })
 
     switch (format) {
       case 'rss':
diff --git a/server/api/controller/tag.js b/server/api/controller/tag.js
index 47e864dd..a54aaf2b 100644
--- a/server/api/controller/tag.js
+++ b/server/api/controller/tag.js
@@ -33,7 +33,7 @@ module.exports = {
     const eventController = require('./event')
     const format = req.params.format || 'json'
     const tags = req.params.tag
-    const events = await eventController._select({ tags: tags.toLocaleLowerCase(), show_recurrent: true, older: true })
+    const events = await eventController._select({ tags: tags.toLocaleLowerCase(), show_recurrent: true, start_datetime: 0, reverse: true })
     switch (format) {
       case 'rss':
         return exportController.feed(req, res, events,