Fix Regex and Sort GetAll