Upgrade query to check for tag and skills, use req.params to get org