now correctly handles having no location selected