diff --git a/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/host_record.py b/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/host_record.py
index 222be89..a3f0f59 100644
--- a/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/host_record.py
+++ b/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/host_record.py
@@ -243,6 +243,15 @@ def lookup(co, lo, filter_s, base='', superordinate=None,scope="sub", unique=0,
 	if filter_s:
 		filter_p=univention.admin.filter.parse(filter_s)
 		univention.admin.filter.walk(filter_p, univention.admin.mapping.mapRewrite, arg=mapping)
+		if filter_p._type_ != 'conjunction':
+			filter_p = univention.admin.filter.conjunction('&', [filter_p])
+		for expression in filter_p.expressions[:]:
+			if expression.variable == 'a':
+				filter_p.expressions.remove(expression)
+				filter_p.expressions.append(univention.admin.filter.conjunction('|', [
+					univention.admin.filter.expression('aRecord', expression.value),
+					univention.admin.filter.expression('aAAARecord', expression.value),
+				]))
 		filter.expressions.append(filter_p)
 
 	res=[]