Added filter, error pages, fixed bugs