Slight modification to listing changes + HTTP clean-up