Fixed bad list search; argparser adjustments