Added filtering out of lists and only including landmarks