Improve topic tags relationship