Add questions fixes

Add questions fixes and answers limit