Added tags
Added date selector