CF: Switched from Prefix to Regex matching, added Lion command