adding subject and groups to the query on subject add