Back To list fixes