#495 subject options changed