Ultimate Answer - Fixed primary query