diff --git a/obp-api/src/main/scala/code/api/v5_1_0/JSONFactory5.1.0.scala b/obp-api/src/main/scala/code/api/v5_1_0/JSONFactory5.1.0.scala
index 153434f533..975ef6e811 100644
--- a/obp-api/src/main/scala/code/api/v5_1_0/JSONFactory5.1.0.scala
+++ b/obp-api/src/main/scala/code/api/v5_1_0/JSONFactory5.1.0.scala
@@ -146,6 +146,8 @@ case class AllConsentJsonV510(consent_reference_id: String,
                               last_action_date: String,
                               last_usage_date: String,
                               jwt_payload: Box[ConsentJWT],
+                              frequency_per_day: Option[Int] = None,
+                              remaining_requests: Option[Int] = None,
                               api_standard: String,
                               api_version: String,
                              )
@@ -895,6 +897,8 @@ object JSONFactory510 extends CustomJsonFormats {
           last_action_date = if (c.lastActionDate != null) new SimpleDateFormat(DateWithDay).format(c.lastActionDate) else null,
           last_usage_date = if (c.usesSoFarTodayCounterUpdatedAt != null) new SimpleDateFormat(DateWithSeconds).format(c.usesSoFarTodayCounterUpdatedAt) else null,
           jwt_payload = jwtPayload,
+          frequency_per_day = if(c.apiStandard == "BG") Some(c.frequencyPerDay) else None,
+          remaining_requests = if(c.apiStandard == "BG") Some(c.frequencyPerDay - c.usesSoFarTodayCounter) else None,
           api_standard = c.apiStandard,
           api_version = c.apiVersion
         )
diff --git a/obp-api/src/main/scala/code/consent/MappedConsent.scala b/obp-api/src/main/scala/code/consent/MappedConsent.scala
index d21ad614f5..2c32edc6bd 100644
--- a/obp-api/src/main/scala/code/consent/MappedConsent.scala
+++ b/obp-api/src/main/scala/code/consent/MappedConsent.scala
@@ -65,13 +65,15 @@ object MappedConsentProvider extends ConsentProvider {
 
 
   private def getQueryParams(queryParams: List[OBPQueryParam]) = {
-    val limit = queryParams.collect { case OBPLimit(value) => MaxRows[MappedConsent](value) }.headOption
-    val offset = queryParams.collect { case OBPOffset(value) => StartAt[MappedConsent](value) }.headOption
+    val limit = queryParams.collectFirst { case OBPLimit(value) => MaxRows[MappedConsent](value) }
+    val offset = queryParams.collectFirst { case OBPOffset(value) => StartAt[MappedConsent](value) }
     // The optional variables:
-    val consumerId = queryParams.collect { case OBPConsumerId(value) => By(MappedConsent.mConsumerId, value)}.headOption
-    val consentId = queryParams.collect { case OBPConsentId(value) => By(MappedConsent.mConsentId, value)}.headOption
-    val userId = queryParams.collect { case OBPUserId(value) => By(MappedConsent.mUserId, value)}.headOption
-    val status = queryParams.collect { case OBPStatus(value) => By(MappedConsent.mStatus, value.toUpperCase())}.headOption
+    val consumerId = queryParams.collectFirst { case OBPConsumerId(value) => By(MappedConsent.mConsumerId, value) }
+    val consentId = queryParams.collectFirst { case OBPConsentId(value) => By(MappedConsent.mConsentId, value) }
+    val userId = queryParams.collectFirst { case OBPUserId(value) => By(MappedConsent.mUserId, value) }
+    val status = queryParams.collectFirst {
+      case OBPStatus(value) => ByList(MappedConsent.mStatus, List(value.toLowerCase(), value.toUpperCase()))
+    }
 
     Seq(
       offset.toSeq,