Added filterQuery and findRecord