Merged upstream, improved parsing, linked detail view + about view + implemented filtering