fixed views and added entity filters