Bug fixes to findBetween