Modified follow query and formatted controller code