Changed WHERE clause to include first_arv_location_id