Fixed DB regex and changes some allowed values