Update search to match new template setup for flags