Now removes old entries when searched a 2nd time