Fix callback condition order
Fix geojson rendering test timeout (fixes #882)