Bug 1047 update - defaults and edge case

Handles edge case where it was possible to highlight adjacent
sub-terms without whitespace between them.

Also makes ignoring words not prefixed by whitespace the
assumed behaviour.