catalog entities cache elements, proposal page refactoring