added tags and filtering option