Various fixes to catalog and handling of requests