enhance template , add tag filtering