Made only one marker show up for every search

Also cleaned up the code a little