Make sure only existent custom properties included in output. Closes #713