Improve code quality
Fix bug in requesting a session and ignoring qualifying