Added query input/model and filter filter.