More case-insensitive search capturing fixes.