some refactoring
VAADINPNL-39 Parse server page instead of read file with latest version