Added dynamic filter population