Subject elements must have a non empty string value

[Shirazos7]

Issue description: reshaping the subjects elements to avoid the non empty string value

TODOS:

the subjects that match those codes, so move those values to the belonging elemetns to avoid the problems and make it much clear and better to read

[Shirazos7]

this commits fix the issue

19bfb4c a196d98