ENG-5899 Get empty catalog stuff working.