adapted builder to new query based feature factory