implement aref_query_map (issue #7)
adjust subjects to aREF spec