Update views & fine-tune subsetting features