Manifest filtering and scrollview fix