diff --git a/aql/hierarchy.go b/aql/hierarchy.go
index bcd76d8408dd711214a4145eb5e67a8c1e193efb..12f6d57877bb909ed8717c287991c79b3073c8c2 100644
--- a/aql/hierarchy.go
+++ b/aql/hierarchy.go
@@ -397,8 +397,8 @@ func AddFilters(JSONQuery *entity.IncomingQueryJSON) {
 	for i, filter := range JSONQuery.Filters {
 		if !filterDone[i] {
 			p := pdict{
-				typename: filter.FilteredType,
-				pointer:  filter.FilteredID,
+				typename: filter.FromType,
+				pointer:  filter.FromID,
 			}
 			f := pdict{
 				typename: "filter",
@@ -421,8 +421,8 @@ func addOneFilter(filterPDict pdict, JSONQuery *entity.IncomingQueryJSON, p pdic
 		(*filterDone)[filterPDict.pointer] = true
 	} else if p.typename == "filter" {
 		pnew := pdict{
-			typename: JSONQuery.Filters[p.pointer].FilteredType,
-			pointer:  JSONQuery.Filters[p.pointer].FilteredID,
+			typename: JSONQuery.Filters[p.pointer].FromType,
+			pointer:  JSONQuery.Filters[p.pointer].FromID,
 		}
 		addOneFilter(p, JSONQuery, pnew, filterDone)
 		l := FindCurrentLayer(listoflists, p)