Improve constraints parsing for empty values