WIP Feature/search and filtering