Search improvements (boosting)

See #6