Improve search query to include remark value.