Fix accidental commit of machine-specific intern config
Multiple cleanup, tests, and fixes
Address TODOs and rename renderQueryResults to renderCollection