Updated query set for index view