Some changes so it works offline in development
Fixing some search