Tweak to model table name handling between searchers / datafactory