Add fnhouse in comparison grid
Various, removed data-readers