improve location checker