WIP in adding back catalogue search