Add search support ( plus search filters for make custom queries )