Several improvements in follow functionality