PHOENIX-43 Better resolve table logic for single table case