Better way to scan source on selection