separated text and code form data in question model. Small bugfixes
Small bugfix