=== modified file 'bin/aat.awk'
--- bin/aat.awk	2013-10-13 22:19:07 +0000
+++ bin/aat.awk	2013-10-09 16:48:47 +0000
@@ -242,8 +242,9 @@
 		} else if(match(str, /^[a-zA-Z_.<>'][a-zA-Z0-9_.<>']*/)) {
 			# a query
 			match_dbg("query", str)
-			processed = processed "<" substr(str, 1, RLENGTH) ">"
+			expand_remaining=substr(str, 1, RLENGTH)
 			str = substr(str, RLENGTH+1)
+			processed = processed expand_query()
 		} else if(match(str, /^\|[a-zA-Z]/)) {
 			# filters ahead
 			match_dbg("filter", str)
@@ -283,12 +284,27 @@
 		str = substr(str, RLENGTH+1)
 		if(str == "") {
 			args = ""
-		} else if(match(str, /\|[a-zA-Z_][a-zA-Z0-9_.]* /)) {
-			args = "," substr(str, 1, RSTART-1)
-			str = substr(str, RSTART)
-		} else {
-			args = "," str
-			str = ""
+		} else if(match(str, /^</)) {
+			expand_remaining = substr(str, 2)
+			args = ", " expand_query()
+			str = expand_remaining
+			while(match(str, /^,</)) {
+				expand_remaining = substr(str, 3)
+				args = args ", " expand_query()
+				str = expand_remaining
+			}
+			if(match(str, /^[^|]+/)) {
+				args = args substr(str, 1, RLENGTH)
+				str = substr(str, RLENGTH+1)
+			}
+		} else if(match(str, /^ /)) {
+			if(match(str, /\|[a-zA-Z_]/)) {
+				args = ", " substr(str, 1, RLENGTH-1)
+				str = substr(str, RSTART)
+			} else {
+				args = ", " str
+				str = ""
+			}
 		}
 		processed = filter_name "(" processed args ")"
 	}