More testing, bugfixing, and improvement (TBI) to the Catalogue module