Yeah it's hard to not listen to that type of stuff. I don't think we have a whole lot to worry about. I just hope that it's within the next few episodes that Emma and the group find out about Neal being alive because if not, then I feel like they will have dragged that for too long.
We know how she feels about Neal. I think the kiss will be a spur of the moment type thing, so hopefully there is some Neal stuff in the episode that will be good for us fans.