Closes #359: Updates queries to join on user_access