Added focus on click, populate tags if any isset