diff --git a/app/src/views/domain/DomainAdd.vue b/app/src/views/domain/DomainAdd.vue
index bd22dbe3..6213d38f 100644
--- a/app/src/views/domain/DomainAdd.vue
+++ b/app/src/views/domain/DomainAdd.vue
@@ -8,6 +8,7 @@
 </template>
 
 <script>
+import api from '@/api'
 import { DomainForm } from '@/views/_partials'
 
 export default {
@@ -15,23 +16,24 @@ export default {
 
   data () {
     return {
-      queries: [{ uri: 'domains' }],
+      queries: [
+        ['GET', { uri: 'domains' }]
+      ],
       serverError: ''
     }
   },
 
   methods: {
     onSubmit ({ domain, domainType }) {
-      const query = {
-        uri: 'domains' + (domainType === 'dynDomain' ? '?dyndns' : ''),
-        data: { domain },
-        storeKey: 'domains'
-      }
-
-      this.$store.dispatch('POST', query).then(() => {
+      const uri = 'domains' + (domainType === 'dynDomain' ? '?dyndns' : '')
+      api.post(
+        { uri, storeKey: 'domains' },
+        { domain }
+      ).then(() => {
         this.$router.push({ name: 'domain-list' })
-      }).catch(error => {
-        this.serverError = error.message
+      }).catch(err => {
+        if (err.name !== 'APIBadRequestError') throw err
+        this.serverError = err.message
       })
     }
   },
diff --git a/app/src/views/domain/DomainCert.vue b/app/src/views/domain/DomainCert.vue
index 880eb181..9b8bea88 100644
--- a/app/src/views/domain/DomainCert.vue
+++ b/app/src/views/domain/DomainCert.vue
@@ -1,5 +1,5 @@
 <template>
-  <view-base :queries="queries" @queries-response="formatCertData" ref="view">
+  <view-base :queries="queries" @queries-response="onQueriesResponse" ref="view">
     <card v-if="cert" :title="$t('certificate_status')" icon="lock">
       <p :class="'alert alert-' + cert.alert.type">
         <icon :iname="cert.alert.icon" /> {{ $t('certificate_alert_' + cert.alert.trad) }}
@@ -83,7 +83,9 @@ export default {
 
   data () {
     return {
-      queries: [`domains/cert-status/${this.name}?full`],
+      queries: [
+        ['GET', `domains/cert-status/${this.name}?full`]
+      ],
       cert: undefined,
       actionsEnabled: undefined
     }
@@ -106,7 +108,7 @@ export default {
       }
     },
 
-    formatCertData (data) {
+    onQueriesResponse (data) {
       const certData = data.certificates[this.name]
 
       const cert = {
diff --git a/app/src/views/domain/DomainDns.vue b/app/src/views/domain/DomainDns.vue
index 249750ec..be947c11 100644
--- a/app/src/views/domain/DomainDns.vue
+++ b/app/src/views/domain/DomainDns.vue
@@ -22,7 +22,9 @@ export default {
 
   data () {
     return {
-      queries: [`domains/${this.name}/dns`],
+      queries: [
+        ['GET', `domains/${this.name}/dns`]
+      ],
       dnsConfig: ''
     }
   }
diff --git a/app/src/views/domain/DomainInfo.vue b/app/src/views/domain/DomainInfo.vue
index 56daf2f5..007315fe 100644
--- a/app/src/views/domain/DomainInfo.vue
+++ b/app/src/views/domain/DomainInfo.vue
@@ -48,6 +48,8 @@
 <script>
 import { mapGetters } from 'vuex'
 
+import api from '@/api'
+
 export default {
   name: 'DomainInfo',
 
@@ -58,9 +60,11 @@ export default {
     }
   },
 
-  data () {
+  data: () => {
     return {
-      queries: [{ uri: 'domains/main', storeKey: 'main_domain' }]
+      queries: [
+        ['GET', { uri: 'domains/main', storeKey: 'main_domain' }]
+      ]
     }
   },
 
@@ -78,7 +82,7 @@ export default {
       const confirmed = await this.$askConfirmation(this.$i18n.t('confirm_delete', { name: this.name }))
       if (!confirmed) return
 
-      this.$store.dispatch('DELETE',
+      api.delete(
         { uri: 'domains', param: this.name }
       ).then(() => {
         this.$router.push({ name: 'domain-list' })
@@ -89,10 +93,11 @@ export default {
       const confirmed = await this.$askConfirmation(this.$i18n.t('confirm_change_maindomain'))
       if (!confirmed) return
 
-      this.$store.dispatch('PUT',
-        { uri: 'domains/main', data: { new_main_domain: this.name }, storeKey: 'main_domain' }
+      api.put(
+        { uri: 'domains/main', storeKey: 'main_domain' },
+        { new_main_domain: this.name }
       ).then(() => {
-        // Have to commit by hand here since the response is empty
+        // FIXME Have to commit by hand here since the response is empty (should return the given name)
         this.$store.commit('UPDATE_MAIN_DOMAIN', this.name)
       })
     }
diff --git a/app/src/views/domain/DomainList.vue b/app/src/views/domain/DomainList.vue
index 3d431e46..5e2f1795 100644
--- a/app/src/views/domain/DomainList.vue
+++ b/app/src/views/domain/DomainList.vue
@@ -47,8 +47,8 @@ export default {
   data () {
     return {
       queries: [
-        { uri: 'domains/main', storeKey: 'main_domain' },
-        { uri: 'domains' }
+        ['GET', { uri: 'domains/main', storeKey: 'main_domain' }],
+        ['GET', { uri: 'domains' }]
       ],
       search: ''
     }