Added support for tags
Added ContentSearch support