Use hash for filter links
minor changes