more restrictions for inverting + comments

SUP-1867 #time 3h