CLN: Improve demo handler.
CLN: Improve demo handler.

danielballan/filestore,NSLS-II/filestore,ericdill/databroker,stuwilkins/filestore,ericdill/fileStore,tacaswell/filestore,danielballan/filestore,ericdill/fileStore,stuwilkins/filestore,ericdill/databroker