adding basic filter and sorting