Tidied name
put elasticache before rds in list
Don't add optgroup if nothing in that group