Add filter and sort --untested but should work