change location limit and add setting