Fixed CW-618 - Fixed search indexing issue.