Switched table name wildcard matching to split on - instead