using QueryBuilder , use ModifiableValueMap, removed unused commented code, fixing Wrong name, removing garbage file, removed ace, using camelcase, implemented timeout confirmation dialog