Changes requested by Daniel

Minus the filterable post stuff, good idea but a bit out of the scope of
the project at our end at the moment.