diff --git a/src/libs/routes/idhmr.js b/src/libs/routes/idhmr.js
index ce86848d7f45ad3a4817fc30b3588143e2a44553..61aa486c9159f89796dde811174f4f2a5fc12c50 100644
--- a/src/libs/routes/idhmr.js
+++ b/src/libs/routes/idhmr.js
@@ -86,15 +86,31 @@ rqf.addField({
           field: 'ano_censo'
       }
 });
+
 idhmrApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
   log.debug(req.sql.toParam());
-   req.sql.field('(adh_idh.idhm_r)', 'IDHMR')
-   .field("'Brasil'", 'name')
-   .field('adh_idh.municipio_id', 'municipio_id')
-   .field('adh_idh.estado_id', 'estado_id')
-   .field('adh_idh.ano_censo', 'year')
-   .from('adh_idh')
-   next();
+  if(typeof req.filter === 'undefined' || Object.keys(req.filter).length === 0 ) {
+    res.status(400);
+    next({
+        status: 400,
+        message: 'Wrong/No filter specified'
+    });
+  }
+  if ("state" in req.filter) {
+      req.sql.field('(adh_idh_uf.idhm_r)', 'IDHM')
+     .field("'Brasil'", 'name')
+     .field('adh_idh_uf.estado_id', 'estado_id')
+     .field('adh_idh_uf.ano_censo', 'year')
+     .from('adh_idh_uf')
+   } else if ("city" in req.filter) {
+     req.sql.field('(adh_idh.idhm_r)', 'IDHM')
+    .field("'Brasil'", 'name')
+    .field('adh_idh.municipio_id', 'municipio_id')
+    .field('adh_idh.estado_id', 'estado_id')
+    .field('adh_idh.ano_censo', 'year')
+    .from('adh_idh')
+  }
+  next();
 }, query, id2str.transform(true), response('idhmr'));
 
 module.exports = idhmrApp;