Updating how query attributes are assigned