improved search and new location addded.