Work towards fixing listing of slots to not list redundant slots