Adding back the Old Api without the Searchable for the QueryBuilderFacto...

This Api was removed from the earlier commit causing backwards incompatibility. To fix the issue we are adding the Api back.