Elements with and without data.

Finish the implementation and also changed all the places where getVar('elements') needed to be replaced by getVar('elementsWithData')