Changed filter implementation to do without extra url redirect