updated query to 2.1.1