two classes added and QueryItem changed