Make search work for both live/dev