Fix highlight tag setting
Refactor decisions search API