change cdata settings only if required

change cdata settings only if required and added questions to screen