Commit changes
Fix CanDecideQuery issue/ Closes #136