parsing improvement
result view improvement