Are you still seeing this with 5.0 Final? If so, please attach a test case or at least your (simplified) Site and Catalog entities