Added registers and fixed typeahead search