More features added, except the search filter