Added custom tags
Fixed bug for displaying activity list