Add zaw for better incremental history search