Search spinner. Template render fixes.
Merging Josh changes to version a