Update to split on space and comma for tags