Added bugfix back to catalog code in staging