Add alternative search actions, fix search