Controller bug fixed, regexps got improved