Fix to only show valid list entries in menu