Speeded up enum lookup and added another catch-all regex for certain kernels under JB