Fixed Tag selection issues