Fixing issue with tag selector