LPS-50555 Consolidate into one Select