Fixed regex + bug with empty info