Finalized axis.type = "category" logic