fixed hcw response, both drop down list and no data found
changes after merging with develop