Fix invalid hash access
Switch to improved parser algorithm