Bug Fix: Select site using the direct site ID