Optional single view restriction, close #35