Add status, Fix search with metadata