fix popup thumb, parser cleanup