Fix for the location filter restriction