Fixing code path for homepage