Change to how userId is queried on page load