moved the listener check logic to defaults and added question container ...

...for remaining subjects