removed unneeded location filter