Minor changes to search (pruning / extensions)