Fix exepception in rendering of #geodistance

Change-Id: I7c66fc2fa826a1df9efa9e937da1c8d930d7d38a
Fixed issues with parserhook tests

Change-Id: I30b79d0e03957e96d56a3a692df200581c152ecb
Merge "Fix exepception in rendering of #geodistance"
Merge "Fixed issues with parserhook tests"