Global parser fix on search