Closed #175, updated checking condition in waf search