slight mode to entity routing, need to fix to support workspace and not