// Fix listings and sort