Resolved issue with Index page not filtering properly