FIX: Improve use of loading spinners on discovery routes