Improve answer type prediction