add in parsing of query attributes