Added filters in Viewing queries