Various re-factors to accomodate ObjectID lookups, also, convenience Workspace column for filtering