More work on tags entry