CW-331 Applied patch for the entity_collection autocomoplete bug