Clean up search, missing index exception and remove domain since it is scoped