Updated Simple Search & List all for new theme