Improve the query to the catalog for include some more use cases. Add wide support for subhomepages