Make OR searches possible
Fix for off by one error in string output. Other fixes.